Merge branch 'maint-0.3.4'

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.

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