Merge remote branch 'public/cbt-status'

ChangeLog

doc/spec/control-spec.txt

src/or/circuitbuild.c

src/or/control.c

src/or/networkstatus.c

src/or/or.h

src/test/test.c