commit a74c18069199763a45fa636d6748d22c4fe98eeb Merge: 9e674d0eb 7b9cb4c47 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 2 08:01:34 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

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