commit 1614e00a219882c9aa32cef66a013d21ac34880c
Merge: aa0c106 86c4b75
Author: Roger Dingledine <[email protected]>
Date: Fri Apr 13 20:11:04 2012 -0400
Merge branch 'maint-0.2.2' into release-0.2.2
changes/bug5593 | 3 +
changes/geoip-april2012 | 3 +
src/config/geoip | 9553 +++++++++++++++++++++++++++++++----------------
src/or/connection.c | 7 +-
4 files changed, 6381 insertions(+), 3185 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
