commit 826daaf726ad06d812b67b3ce0b43fd7662c5e7d
Merge: c90c370 d93caf7
Author: Nick Mathewson <[email protected]>
Date: Mon May 20 12:42:36 2013 -0400
Merge remote-tracking branch 'karsten/geoip-manual-update-may2013'
src/config/deanonymind.py | 27 +++++++---
src/config/geoip-manual | 121 +++++++++++++++++----------------------------
2 files changed, 65 insertions(+), 83 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
