Merge branch 'ticket32892_043_01_squashed'

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

diff --cc src/core/or/channel.h
Simple merge

diff --cc src/core/or/command.c
Simple merge

diff --cc src/core/or/command.h
Simple merge

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