Merge branch 'bug23512-v4-033' into bug23512-v4-master

changes/bug23512

src/core/or/channeltls.h

src/core/or/circuitlist.c

src/core/or/circuitlist.h

src/core/or/or.h

src/core/or/relay.c

src/core/or/scheduler_kist.c

src/feature/stats/rephist.c

src/feature/stats/rephist.h

src/test/test_relay.c