Merge remote-tracking branch 'origin/maint-0.2.4'

src/or/channel.c

src/or/circuitbuild.c

src/or/circuitlist.c

src/or/circuitmux.c

src/or/circuituse.c

src/or/command.c

src/or/connection_edge.c

src/or/connection_or.c

src/or/cpuworker.c

src/or/rendclient.c

src/or/rendmid.c

src/or/rendservice.c