commit 6ac0ec566ebc5749cdb3786b78e3e58c1c065521 Merge: a1c06b84b 033e4723f Author: Nick Mathewson <nickm@torproject.org> Date: Tue May 15 09:32:44 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-2018-05-01 | 4 + src/config/geoip | 5455 ++++++++++++++++++++++++++++++---------------- src/config/geoip6 | 971 +++++++-- 3 files changed, 4468 insertions(+), 1962 deletions(-)