commit 159ddf6ddedcad2bfc277a36fbde4aeb573be4cf Merge: 21d7767 68d6720 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 8 08:07:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)