commit 329aa1c48ef838bd0ef0e83d829f1a6533b8f77f Merge: 29940511e 7beaaed24 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 11 10:14:03 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 3078 ++++++--- 3 files changed, 11485 insertions(+), 7348 deletions(-)