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

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

dgoulet pushed a commit to branch main in repository tor.

commit 1a5b612832b46331a2a545329cfa78d36130d84f Merge: f64a88e72d 32400b5688 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Mar 16 14:03:31 2022 -0400

Merge branch 'tor-gitlab/mr/548'

changes/ticket40586 | 5 +++ src/feature/hs/hs_circuit.c | 82 +++++++++++++++++++++++++++------------------ src/feature/hs/hs_circuit.h | 4 +++ src/feature/hs/hs_client.c | 25 ++++---------- 4 files changed, 65 insertions(+), 51 deletions(-)