commit 34a51d162153f12d34f2445c6efa72dc4f6ddcd8 Merge: 21f9829 97c6e71 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 7 10:45:32 2016 -0400

Merge branch 'maint-0.2.4' into maint-0.2.5

changes/geoip-april2016 | 4 + src/config/geoip | 3255 +++++++++++++++++++++++++++++++++++------------ src/config/geoip6 | 2549 +++++++++++++++++++++++++++++-------- 3 files changed, 4455 insertions(+), 1353 deletions(-)