Merge remote branch 'mikeperry/cbt-bugfixes3'

diff --cc doc/spec/control-spec.txt
Simple merge

diff --cc doc/spec/path-spec.txt
Simple merge

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/circuitbuild.c
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/control.c
Simple merge

diff --cc src/or/or.h
Simple merge