[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.7-redux' into maint-0.2.8

commit 307be8d4a7f1607b14bac6d9ed757e20a2008a16 Merge: 6e90d75 24ee859 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 9 09:58:45 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/geoip-june2017 | 4 + src/config/geoip | 5079 +++++++++++++++++++++++++----------------------- src/config/geoip6 | 1952 +++++++++++++++++-- 3 files changed, 4449 insertions(+), 2586 deletions(-)