Merge branch 'bug24666_squashed_025' into maint-0.2.5

changes/bug24666

src/or/circuitmux.c

src/or/circuitmux.h

src/or/or.h

src/or/relay.c

src/or/relay.h

src/test/test_circuitmux.c