commit 2ba19f9b4a052dcaa5ebd3c6a629e1ec67a595f9
Merge: 2b5ebc7 021cf3f
Author: Nick Mathewson <[email protected]>
Date: Fri Jul 1 12:55:23 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
changes/cid_428 | 5 +++++
changes/cid_450 | 5 +++++
src/common/compat.c | 16 ++++++++++++++--
src/or/connection.c | 8 +++++++-
src/or/rendcommon.c | 1 +
5 files changed, 32 insertions(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
