commit c77ace69bb7342522366a6ce2bdb51a26bf34f57
Merge: cb2e205 8c91cbb
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Wed Jan 11 09:13:15 2017 -0500
Merge branch 'maint-0.2.7' into maint-0.2.8
changes/geoip-january2017 | 4 +
src/config/geoip | 3160 +++++++++++++++++++++++++++++----------------
src/config/geoip6 | 561 +++++++-
3 files changed, 2552 insertions(+), 1173 deletions(-)