Merge branch 'dgoulet_ticket23709_033_01_squashed'

diff --cc src/or/channel.c
Simple merge

diff --cc src/or/circuitlist.c
Simple merge

diff --cc src/or/connection_or.c
Simple merge

diff --cc src/or/relay.c
Simple merge

diff --cc src/test/test_scheduler.c
Simple merge