commit 15a2c20e338e9e9cecfbb28a4d2aa14cd4c2a47d Merge: d7f76b8c4 853b6ad09 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 11 10:14:02 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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