commit 4dbbc000b5082210c79e8dfe09f7410abc10e982 Merge: 679ba1a226 5d1d7afcd3 Author: David Goulet dgoulet@torproject.org Date: Tue Sep 22 13:39:55 2020 -0400

Merge branch 'tor-gitlab/mr/145'

changes/ticket40124 | 3 +++ src/feature/hs/hs_service.c | 9 +++++---- src/feature/keymgt/loadkey.c | 4 ++-- src/feature/nodelist/torcert.c | 12 ++++++------ src/feature/nodelist/torcert.h | 12 ++++++++++-- src/feature/relay/routerkeys.c | 14 ++++++-------- src/test/hs_test_helpers.c | 8 +++++--- src/test/test_dir.c | 4 ++-- src/test/test_hs_descriptor.c | 9 +++++---- src/test/test_link_handshake.c | 2 +- src/test/test_routerkeys.c | 2 +- 11 files changed, 46 insertions(+), 33 deletions(-)