Merge branch 'tor-gitlab/mr/145'

changes/ticket40124

src/feature/hs/hs_service.c

src/feature/keymgt/loadkey.c

src/feature/nodelist/torcert.c

src/feature/nodelist/torcert.h

src/feature/relay/routerkeys.c

src/test/hs_test_helpers.c

src/test/test_dir.c

src/test/test_hs_descriptor.c

src/test/test_link_handshake.c

src/test/test_routerkeys.c