commit c217d6d8d577114613253537bcbc36af2adefff8
Merge: 2794097 ec718aa
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Oct 6 10:01:11 2016 -0400
Merge branch 'maint-0.2.7' into release-0.2.7
changes/geoip-october2016 | 4 +
changes/geoip-september2016 | 4 +
src/config/geoip | 42715 ++++++++++++++++++++++++++++++------------
src/config/geoip6 | 3143 +++-
4 files changed, 32842 insertions(+), 13024 deletions(-)