commit 9914f906e332e93ae9e4116f015f7c23ab733a38 Merge: ad54a025d 969602159 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 3 08:44:31 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-august2017 | 4 + src/config/geoip | 10796 ++++++++++++++++++++++++++++----------------- src/config/geoip6 | 607 ++- 3 files changed, 7161 insertions(+), 4246 deletions(-)