commit 935ac71079a21aeaf7a6488f567b436bc9850ea0 Merge: 46ab93ca7 a3f9ddcf0 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 12 09:56:48 2019 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-2019-02-05 | 4 + src/config/geoip | 22020 ++++++++++++++++++++++++++++++++------------- src/config/geoip6 | 2401 +++-- 3 files changed, 16972 insertions(+), 7453 deletions(-)