commit 372adfa09a143490dfc058a6e2db78ca27ef9399
Merge: 5990edd a7e9465
Author: Nick Mathewson <[email protected]>
Date: Fri Feb 7 10:38:24 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug9602 | 5 ++
src/or/channeltls.c | 193 +++++++++++++++++++++++++++++++-----------------
src/or/connection.c | 16 ++++
src/or/connection_or.c | 5 ++
4 files changed, 150 insertions(+), 69 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
