Merge branch 'bug22805_v2_squashed'

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

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

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

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

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

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

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

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