commit d92e622b41927872f47942c71149a1810c5735ed Merge: 64bc149 9d79332 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 6 08:32:31 2017 -0400

Merge branch 'maint-0.2.4' into release-0.2.4

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