nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.4'

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-18 17:09:03 -04:00
commit f3267741e4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug26402 Normal file
View File

@ -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.

2
src/or/include.am
View File

@ -131,7 +131,7 @@ endif
src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES) src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
if UNITTESTS_ENABLED 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 else
src_or_libtor_testing_a_SOURCES = src_or_libtor_testing_a_SOURCES =
endif endif