Merge branch 'bug18570_027'

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

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

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

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

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