commit 92f8b56e27450f3646ea1b2a5751fce9e77beb86 Merge: 8bcc14f f601605 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 13 14:39:10 2017 -0500

Merge branch 'maint-0.2.4' into release-0.2.4

changes/geoip-february2017 | 4 + src/config/geoip | 10832 ++++++++++++++++++++++++------------------- src/config/geoip6 | 1651 ++++++- 3 files changed, 7351 insertions(+), 5136 deletions(-)