commit 34fdd510efc2ee66113457d3f1339f7c8ebf70c0 Merge: 39ef343 3833f67 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 11 09:11:58 2017 -0500

Merge branch 'maint-0.2.4' into maint-0.2.5

changes/geoip-january2017 | 4 + src/config/geoip | 3160 +++++++++++++++++++++++++++++---------------- src/config/geoip6 | 561 +++++++- 3 files changed, 2552 insertions(+), 1173 deletions(-)