diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-18 17:09:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-18 17:09:03 -0400 |
| commit | f3267741e45c7944196696c51b81d76201af1e76 (patch) | |
| tree | 662f5dc955fccd93ce464ec4d968be2e0b067f8a | |
| parent | 9af6c48d24ccc38d8e9301a208dddc8695fe63c6 (diff) | |
| parent | d27745d81de8829d1a6da851fe9be057458e86df (diff) | |
| download | tor-f3267741e45c7944196696c51b81d76201af1e76.tar.gz tor-f3267741e45c7944196696c51b81d76201af1e76.zip | |
Merge branch 'maint-0.3.4'
| -rw-r--r-- | changes/bug26402 | 4 | ||||
| -rw-r--r-- | src/or/include.am | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug26402 b/changes/bug26402 new file mode 100644 index 0000000000..b21283a2d2 --- /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 af525f35cf..49b07efe31 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 |