Merge remote-tracking branch 'houqp/hs_control'

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

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

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

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