Merge branch 'ticket27686_035'

src/core/or/circuitlist.c

src/core/or/connection_edge.c

src/core/or/connection_edge.h

src/core/or/relay.c