commit 55cf1970bce222a32c387652fe5080adb2aa1513 Merge: 72601d7 7fe80c2 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 9 14:59:18 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/geoip-may2016 | 4 + src/config/geoip | 6991 ++++++++++++++++++++++++++++--------------------- src/config/geoip6 | 904 +++++-- 3 files changed, 4631 insertions(+), 3268 deletions(-)