commit a219449b9cd995cde9723ff9023f93cca181c060 Merge: 50dcbf261 afa2c39ba Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 11 10:17:18 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/geoip-2019-06-10 | 4 + src/config/geoip | 14985 +++++++++++++++++++++++++-------------------- src/config/geoip6 | 2391 ++++++-- 3 files changed, 9920 insertions(+), 7460 deletions(-)