commit 9d24a352c01414b14c3ffe02541508345ca32a10 Merge: ad35e595e 925ef048a Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:19:30 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

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