tor

commit f3267741e45c7944196696c51b81d76201af1e76
parent 9af6c48d24ccc38d8e9301a208dddc8695fe63c6
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 18 Jun 2018 17:09:03 -0400

Merge branch 'maint-0.3.4'

Diffstat:
A
changes/bug26402
 | 
4
++++
M
src/or/include.am
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug26402 b/changes/bug26402
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - When linking the libtor_testing.a library, only include the dirauth
+      object files once.  Previously, they were getting added twice.
+      Fixes bug 26402; bugfix on 0.3.4.1-alpha.
diff --git a/src/or/include.am b/src/or/include.am
@@ -131,7 +131,7 @@ endif
 
 src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
 if UNITTESTS_ENABLED
-src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) $(MODULE_DIRAUTH_SOURCES)
+src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
 else
 src_or_libtor_testing_a_SOURCES =
 endif