commit 170b58b73bbeaad77c2719d894d24ec156b5c716 Merge: b858f22c5 925ef048a Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 11:19:29 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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