commit 0bfd1c318cdd468d2699714a36687e9cda16fabb Merge: af39c13a0 6199e27a2 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:19:28 2017 -0400

Merge branch 'maint-0.2.4' into maint-0.2.5

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