commit 21f9829e793fd9074c568ffffbee548e345536df Merge: ce289e2 8e2640b Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 9 10:36:20 2016 -0500

Merge branch 'maint-0.2.4' into maint-0.2.5

changes/geoip-march2016 | 4 + src/config/geoip | 8496 +++++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2270 ++++++------- 3 files changed, 6524 insertions(+), 4246 deletions(-)