commit cb3f9bc2d48e8c3f4847643c03e082d394d33168
Merge: a42938c 72ebf41
Author: Nick Mathewson <[email protected]>
Date: Mon Mar 21 10:20:16 2016 -0400
Merge branch 'bug18570_027'
changes/bug18570 | 7 +++
src/or/channel.c | 38 +++++++++++++--
src/or/channeltls.c | 11 +++++
src/or/connection_or.c | 35 ++++++++++++++
src/or/connection_or.h | 1 +
src/test/test_channel.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++--
6 files changed, 204 insertions(+), 9 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
