commit 98fa3956ac9d6aad165ee2c1d016cc582fe28d8e
Merge: cee716a 7c9be64
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Mar 9 16:25:22 2015 -0400
Merge branch 'maint-0.2.6' into release-0.2.6
changes/geoip-march2015 | 3 +
changes/geoip6-march2015 | 3 +
src/config/geoip |12695 ++++++++++++++++++++++++++++++++++------------
src/config/geoip6 | 1228 ++++-
4 files changed, 10398 insertions(+), 3531 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
