commit 44010c6fc11608b13924372a179825946672cb23 Merge: bb7c5b431 50124fd7a Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 8 14:44:09 2017 -0500

Merge branch 'dgoulet_ticket23709_033_01_squashed'

changes/ticket23709 | 11 + src/or/channel.c | 1598 ++++------------------------------------ src/or/channel.h | 91 +-- src/or/channeltls.c | 13 +- src/or/circuitbuild.c | 3 +- src/or/circuitlist.c | 3 +- src/or/connection_or.c | 3 - src/or/relay.c | 129 +--- src/test/fakechans.h | 1 - src/test/test_channel.c | 1797 ++++++++++++++++++--------------------------- src/test/test_relay.c | 4 - src/test/test_scheduler.c | 12 - 12 files changed, 906 insertions(+), 2759 deletions(-)