commit 92cba63459c0b3cac59f6daa75506a967e515907
Merge: 009453f 0be946c
Author: Nick Mathewson <[email protected]>
Date: Tue May 15 10:01:12 2012 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/geoip-may2012 | 3 +
src/config/geoip | 748 ++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 647 insertions(+), 104 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
