commit f5876917aaa5a79577ec27fd8302f75085b41e8e Merge: 7ae7e3c 5ff0b51 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 8 08:07:38 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)