[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

commit 404a094142f713aca906e1bcab52623b677ad346 Merge: b2cab96 104e8fa Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 9 09:58:45 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-june2017 | 4 + src/config/geoip | 5079 +++++++++++++++++++++++++----------------------- src/config/geoip6 | 1952 +++++++++++++++++-- 3 files changed, 4449 insertions(+), 2586 deletions(-)