commit 29eb7b07ef5d5af0c54bbc36804363a0bfdd3252 Merge: 7043be968 329aa1c48 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 11 10:14:04 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/geoip-2019-11-06 | 4 + src/config/geoip | 15751 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 3078 ++++++--- 3 files changed, 11485 insertions(+), 7348 deletions(-)