commit 76177368c97c912cc1507e3eeed361c3ca169955 Merge: c0543ac32 329aa1c48 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 11 10:14:04 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

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