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

commit 0e7558ab6495cdb64d605331d1dc28eb2a956e26 Merge: 5c5eb0f09 a48ae2aa6 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:19:29 2017 -0400

Merge branch 'maint-0.2.7-redux' into maint-0.2.8

changes/geoip-july2017 | 4 + src/config/geoip | 10075 ++++++++++++++++++++++++++++++++--------------- src/config/geoip6 | 694 +++- 3 files changed, 7530 insertions(+), 3243 deletions(-)