commit 2ee3dbe8018aa4c4b1988df77ccc6a6fda753ea9 Merge: ada5668 80089c9 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 13 10:49:05 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-jun2016 | 4 + src/config/geoip | 3349 +++++++++++++++++++++++++++++++++++-------------- src/config/geoip6 | 1366 ++++++++++++++++---- 3 files changed, 3527 insertions(+), 1192 deletions(-)