commit 148d76c0928c224c500c9a3d1963cff9f2201631 Merge: 51ca3dc a8a860e Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 6 08:32:36 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

changes/geoip-april2017 | 4 + src/config/geoip | 14366 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 677 ++- 3 files changed, 9792 insertions(+), 5255 deletions(-)