commit 996cbdac3f23844e98854da6a2c7f122eb6dc406 Merge: 77733021e 7b9cb4c47 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 2 08:01:33 2019 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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