commit d1bd1986867713be146a84639ed22ae2dd95795e Merge: 58046be10 7beaaed24 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 11 10:14:03 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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