[tor-commits] [tor] 03/03: Merge branch 'tor-gitlab/mr/710'

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

commit 0781c2968d26fba999a00c3989c10964f492f9dc Merge: 6afe03aa51 71b2958a62 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed May 24 11:12:22 2023 -0400

Merge branch 'tor-gitlab/mr/710'

src/feature/hs/hs_descriptor.c | 21 ++++++++++--- src/feature/hs/hs_descriptor.h | 7 +++++ src/test/hs_test_helpers.c | 12 ++++++++ src/test/test_hs_descriptor.c | 69 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 4 deletions(-)