commit 33b69e68847fd3cb7fd3a300633e5c4966afda6b Merge: 148d76c 68d6720 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 8 08:08:01 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)