commit a8a860e1dac94e2194b4d073ee3245978121bbe8 Merge: 933a1e7 9d79332 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 6 08:31:12 2017 -0400

Merge branch 'maint-0.2.4' into maint-0.2.5

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