commit 2e2ec4cb5ee71650aa014d5d523b41abe12379f3 Merge: 0c44446c4 0bfd1c318 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:19:28 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

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