touchups and refactorings on bug 18616 branch

changes/bug18616

src/or/circuitbuild.c

src/or/circuituse.c

src/or/control.c

src/or/dirserv.c

src/or/main.c

src/or/rephist.c

src/or/router.c

src/or/router.h