Merge remote-tracking branch 'asn/ticket23645_032_01'

src/or/circuitlist.c

src/or/circuituse.c

src/or/hs_service.c

src/test/test_hs_service.c