commit db2571be619530389c7ca3066cfc86b32cfc7578 Merge: 304d8f3 ea59783 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 7 09:29:54 2016 -0500

Merge branch 'maint-0.2.4' into maint-0.2.5

changes/geoip-november2016 | 4 + src/config/geoip | 4025 ++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2490 ++++++++++----------------- 3 files changed, 3407 insertions(+), 3112 deletions(-)