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