Merge branch 'mr/113'

changes/bug20165

src/core/or/channel.c

src/core/or/channel.h

src/core/or/channeltls.c

src/feature/relay/circuitbuild_relay.c

src/feature/relay/router.c

src/feature/relay/router.h