[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4

commit 6199e27a2b4ce4d56a1de9cf35ff09f79c9b6624 Merge: ebb441ded b6acfa491 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:19:24 2017 -0400

Merge remote-tracking branch 'karsten/geoip-jul2017' into maint-0.2.4

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