commit 2cfecec9c7959185877777fa853bba606c05e513 Merge: f93bcab 25c28bc Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 8 10:11:23 2017 -0500 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 changes/geoip-march2017 | 4 + src/config/geoip | 13115 +++++++++++++++++++--------------------------- src/config/geoip6 | 754 ++- 3 files changed, 5884 insertions(+), 7989 deletions(-)