commit 1905a83aabf2d9c47492e510fc1deb25942aa5f8 Merge: 3e1717cd0 9faa28b60 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 9 09:11:41 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-2018-07-03 | 4 + src/config/geoip | 7171 ++++++++++++++++++++-------------------------- src/config/geoip6 | 752 +++-- 3 files changed, 3732 insertions(+), 4195 deletions(-)