Merge branch 'bug12184_diagnostic_squashed'

changes/bug12184_diagnostic

src/or/circuitbuild.c

src/or/circuitlist.c

src/or/circuitlist.h

src/or/circuitmux.c

src/or/circuitmux.h

src/or/relay.c

src/or/relay.h