commit 4dcbbe4166192beae321001e820bd3c15a8f2512 Merge: 6f3f93d86 a74c18069 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 2 08:01:34 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

changes/geoip-2019-10-01 | 4 + src/config/geoip | 35299 ++++++++++++++++++++++++++------------------- src/config/geoip6 | 8318 ++++++++--- 3 files changed, 26359 insertions(+), 17262 deletions(-)