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

commit ae0586ff89f1deacc56871be85e07f4f96b5e4dd Merge: da819de 25c28bc Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 8 10:11:16 2017 -0500 Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)