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

commit dc34cd7a04f54e63ab1c32a5de9fa116a8ad7ff8 Merge: 91c6b18 71dd1d7 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 8 08:07:19 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)