Update with code review changes from Nick.

src/or/circuitbuild.c

src/or/circuitbuild.h

src/or/config.c

src/or/entrynodes.c

src/or/entrynodes.h

src/or/or.h