commit 00341d97f356142619865218b2ff6a6ae95dca5d Merge: ffc7b81b5 57798eb1c Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 6 09:26:32 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

changes/geoip-2018-12-05 | 4 + src/config/geoip | 10100 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 3151 +++++++++----- 3 files changed, 8147 insertions(+), 5108 deletions(-)