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

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