[tor-commits] [tor] 09/10: Merge remote-tracking branch 'tor-gitlab/mr/638'

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

dgoulet pushed a commit to branch main in repository tor.

commit dd272b6ef4c28306a3c3966a7a69efd0c6ff42f4 Merge: 95f61cc84f 4ed67fe174 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Oct 26 15:12:54 2022 -0400

Merge remote-tracking branch 'tor-gitlab/mr/638'

changes/ticket40694 | 5 ++ src/core/or/circuituse.c | 108 ++++++++++++++-------------------------- src/core/or/origin_circuit_st.h | 24 --------- src/feature/hs/hs_circuit.c | 21 +------- src/feature/hs/hs_circuit.h | 2 +- src/feature/hs/hs_service.c | 3 ++ 6 files changed, 47 insertions(+), 116 deletions(-)