commit 24ee8595bf3aa8648d37c2f94277c33bfbc8db64 Merge: 2f6be06 3913f95 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 9 09:58:45 2017 -0400

Merge branch 'maint-0.2.6' into maint-0.2.7-redux

changes/geoip-june2017 | 4 + src/config/geoip | 5079 +++++++++++++++++++++++++----------------------- src/config/geoip6 | 1952 +++++++++++++++++-- 3 files changed, 4449 insertions(+), 2586 deletions(-)