commit 4e10ada1e8262a3d8038f09eca1b92570a12c59d Merge: 2e2ec4cb5 1280de42a Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 3 08:44:31 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

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