commit d8a056daed78c9794037931db81b97d596505bb7 Merge: f6ffe53 ad4ff7a Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 7 10:46:07 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-april2016 | 4 + src/config/geoip | 3255 +++++++++++++++++++++++++++++++++++------------ src/config/geoip6 | 2549 +++++++++++++++++++++++++++++-------- 3 files changed, 4455 insertions(+), 1353 deletions(-)