commit d27745d81de8829d1a6da851fe9be057458e86df Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 18 17:03:52 2018 -0400

Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a

This was already added to LIBTOR_A_SOURCES; it doesn't need to get added again.

Fixes bug 26402. Bugfix on 0.3.4.1-alpha. --- changes/bug26402 | 4 ++++ src/or/include.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug26402 b/changes/bug26402 new file mode 100644 index 000000000..b21283a2d --- /dev/null +++ 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 index 0e2aac4aa..33d76eebd 100644 --- 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