sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.7' into release-0.2.7

This commit is contained in:
Nick Mathewson 2016-05-09 14:57:03 -04:00
parent 24aaeef664 7fe80c2905
commit 87d6a149a1
5 changed files with 4641 additions and 3271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/build18490 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (build):
- Do not link the unit tests against both the testing and non-testing
versions of the static libraries. Fixes bug 18490; bugfix on
0.2.7.1-alpha.

4
changes/geoip-may2016 Normal file
View File

@ -0,0 +1,4 @@
o Minor features:
- Update geoip and geoip6 to the May 4 2016 Maxmind GeoLite2
Country database.

6991
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

904
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff

9
src/test/include.am
View File

@ -128,9 +128,12 @@ src_test_test_workqueue_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
@TOR_LDFLAGS_libevent@
src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \
src/common/libor-crypto-testing.a $(LIBDONNA) src/common/libor.a \
src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \
src_test_test_LDADD = src/or/libtor-testing.a \
src/common/libor-crypto-testing.a \
$(LIBDONNA) \
src/common/libor-testing.a \
src/common/libor-event-testing.a \
src/trunnel/libor-trunnel-testing.a \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
@TOR_SYSTEMD_LIBS@