Merge branch 'bug18570_027'
commitcb3f9bc2d48e8c3f4847643c03e082d394d33168
authorNick Mathewson <nickm@torproject.org>
Mon, 21 Mar 2016 14:20:16 +0000 (21 10:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 21 Mar 2016 14:20:16 +0000 (21 10:20 -0400)
tree738d21dd0265596baf2f8fd5482a5a9508212e15
parenta42938c07670162863decc952b4d73681d9302d6
parent72ebf4160412f64fb6ae0cd97dd89d01d89c075a
Merge branch 'bug18570_027'
src/or/channel.c
src/or/channeltls.c
src/or/connection_or.c
src/or/connection_or.h
src/test/test_channel.c