Merge branch 'ticket32892_043_01_squashed'

changes/ticket32892

src/core/or/channel.c

src/core/or/channel.h

src/core/or/command.c

src/core/or/command.h

src/test/test_channel.c