commit 4efbb5d2c1cedd2ad6e8bf55e365c84bc99f4d66 Merge: ee6f54ff3 de76862fd Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 3 09:27:44 2019 -0400

Merge branch 'maint-0.4.0'

changes/geoip-2019-04-02 | 4 + src/config/geoip | 10355 +++++++++++++++++++++++++-------------------- src/config/geoip6 | 2337 ++++++---- 3 files changed, 7344 insertions(+), 5352 deletions(-)