Merge remote-tracking branch 'neel/b23094'

changes/bug23094

src/or/hs_common.c

src/or/hs_common.h

src/or/hs_control.c

src/or/hs_service.c

src/or/nodelist.c

src/or/or.h

src/test/test_hs_control.c