commit ec718aa83914e848ca9ee5e828731477a410e484
Merge: 11edbf4 12a7298
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Oct 6 09:59:18 2016 -0400
Merge branch 'maint-0.2.6' into maint-0.2.7
changes/geoip-october2016 | 4 +
src/config/geoip | 63919 +++++++++++++++++++++++++++++++++-----------
src/config/geoip6 | 1496 +-
3 files changed, 48664 insertions(+), 16755 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
