[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.4' into maint-0.3.5

commit e5deb2bbc73d8830ae6c479a4532e72112f5484a Merge: 6945f2b3e a521c4278 Author: Nick Mathewson <nickm@torproject.org> Date: Fri May 17 08:10:16 2019 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2019-05-13 | 4 + src/config/geoip | 15407 ++++++++++++++++++++++++++------------------- src/config/geoip6 | 3771 +++++++---- 3 files changed, 11335 insertions(+), 7847 deletions(-)