Merge remote-tracking branch 'public/bug11553_025'

changes/bug11553

src/or/channel.c

src/or/channel.h

src/or/circuitbuild.c

src/or/circuitlist.c

src/or/connection.c