Merge branch 'bug7087_2' of ssh://git-rw.torproject.org/user/andrea/tor

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

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