commit 68d6720452fda2ffbc1a484672aa6d09c99f1d41 Merge: a8a860e 5207e41 Author: Nick Mathewson nickm@torproject.org Date: Mon May 8 08:06:59 2017 -0400

Merge branch 'maint-0.2.4' into maint-0.2.5

changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)