commit c42071f7503897a8ccdcffabb6bdcff427d77d5e Merge: 349f95017 e845bd17f Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 21 08:59:58 2018 -0400

Merge branch '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(-)