Merge branch 'bug6153_squashed'

changes/6153_circuittime_accessor

src/or/channel.c

src/or/circuitbuild.c

src/or/circuitlist.c

src/or/circuitstats.c

src/or/circuitstats.h

src/or/circuituse.c

src/or/connection_or.c

src/or/control.c

src/or/control.h

src/or/entrynodes.c

src/or/networkstatus.c

src/or/or.h

src/or/statefile.c