commit 183a62d8cec32ed2569981d8ee5f772a8da35481
Merge: 49670ed 159ddf6
Author: Nick Mathewson <[email protected]>
Date: Mon May 8 08:08:05 2017 -0400
Merge branch 'maint-0.2.6' into release-0.2.6
changes/geoip-may2017 | 4 +
src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------
src/config/geoip6 | 689 +++++-
3 files changed, 4358 insertions(+), 2197 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
