commit ad4ff7a5b93a9236b6084548798815540ad91cbe
Merge: 183d465 2ce99b9
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Apr 7 10:45:46 2016 -0400
Merge branch 'maint-0.2.6' into maint-0.2.7
changes/geoip-april2016 | 4 +
src/config/geoip | 3255 +++++++++++++++++++++++++++++++++++------------
src/config/geoip6 | 2549 +++++++++++++++++++++++++++++--------
3 files changed, 4455 insertions(+), 1353 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
