commit 7761c1d6ac639580b686dac4b5d0607060b8c8f6
Merge: a08bbef ebda15e
Author: Nick Mathewson <[email protected]>
Date: Fri Jun 22 22:41:12 2012 -0400
Merge remote-tracking branch 'origin/maint-0.2.3'
changes/bug6203 | 5 +++++
changes/bug6211 | 4 ++++
src/or/connection_edge.c | 17 ++++++++++-------
src/or/main.c | 13 ++++++++++++-
4 files changed, 31 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
