commit e845bd17f8592c8c52fb2f5af31ddd859b22cda5 Merge: 97925322a cacf326e7 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 21 08:56:27 2018 -0400

Merge branch 'bug25787_squashed' into maint-0.3.4

changes/bug25787 | 7 +++++ src/test/geoip_dummy | 0 src/test/include.am | 1 - src/test/test_geoip.c | 83 ++++++++++++++++++++++++++++++++++----------------- 4 files changed, 63 insertions(+), 28 deletions(-)