commit eb8ea92cf9d93dc2d86d1e62e26110fbca7fdf59 Merge: 834477622 a920597f6 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 11 10:14:04 2019 -0500

Merge branch 'maint-0.4.2'

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