commit 8a363a7c8467093061d02fe611d18a971f0c1078 Merge: c26fa0537 b68e636b3 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 5 08:22:34 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-2018-04-03 | 4 + src/config/geoip | 39253 ++++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 5391 +++---- 3 files changed, 31480 insertions(+), 13168 deletions(-)