commit bcac0bb342fd012bdf2e9a94b9fac5ae725e09ba Merge: 37b0dd08a 54e249e26 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 3 09:27:42 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-2019-04-02 | 4 + src/config/geoip | 10355 +++++++++++++++++++++++++-------------------- src/config/geoip6 | 2337 ++++++---- 3 files changed, 7344 insertions(+), 5352 deletions(-)