commit 44bc8821b108925e761769b383a0f28e29823000
Merge: 25c28bc 21d7767
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Apr 6 08:31:23 2017 -0400
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
changes/geoip-april2017 | 4 +
src/config/geoip | 14366 +++++++++++++++++++++++++++++-----------------
src/config/geoip6 | 677 ++-
3 files changed, 9792 insertions(+), 5255 deletions(-)