commit 26df7c7f4a5b959ce0115fb4f38a29504ec677d0 Merge: 0392c104f 119df9c1c Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 10 11:34:48 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-2018-10-09 | 4 + src/config/geoip | 38518 ++++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 1317 +- 3 files changed, 30779 insertions(+), 9060 deletions(-)