commit e2dde342b240039c9d4a254a2313fa9ab53d49d7 Merge: fa6296df3 a521c4278 Author: Nick Mathewson nickm@torproject.org Date: Fri May 17 08:10:16 2019 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/geoip-2019-05-13 | 4 + src/config/geoip | 15407 ++++++++++++++++++++++++++------------------- src/config/geoip6 | 3771 +++++++---- 3 files changed, 11335 insertions(+), 7847 deletions(-)