Merge branch 'bug25691_033_again_squashed'

changes/bug25691_again

src/or/circuitbuild.c

src/or/circuituse.c

src/or/control.c

src/or/entrynodes.c

src/or/hs_common.c

src/or/nodelist.c

src/or/nodelist.h

src/or/rendservice.c

src/or/routerlist.c

src/test/test_hs.c

src/test/test_hs_common.c