commit 23a5921e9aebfa912f16bff541a9bdae5211ee86
Merge: 5015279 d7950ed
Author: Nick Mathewson <[email protected]>
Date: Tue Feb 25 10:04:10 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/geoip-february2014-regcountry | 3 +
src/config/geoip | 2399 ++++++++++++++-------------------
2 files changed, 1035 insertions(+), 1367 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
