Merge remote-tracking branch 'houqp/hs_control'

changes/ticket8510

src/or/control.c

src/or/control.h

src/or/directory.c

src/or/rendclient.c

src/or/router.c

src/or/router.h

src/test/Makefile.nmake

src/test/include.am

src/test/test.c

src/test/test_hs.c

src/test/test_router.c