Merge branch 'ticket27686_034' into x

diff --cc src/core/or/circuitlist.c
Simple merge

diff --cc src/core/or/connection_edge.c
Simple merge

diff --cc src/core/or/connection_edge.h
Simple merge

diff --cc src/core/or/relay.c
Simple merge