commit 69f1a7aa5944060f62ab3761f468cb6cd654d636 Merge: 37b0d464b8 2d0377be75 Author: David Goulet dgoulet@torproject.org Date: Wed Feb 23 13:19:10 2022 -0500

Merge branch 'tor-gitlab/mr/536'

src/feature/hs/hs_cell.c | 6 ++++++ src/feature/hs/hs_circuit.c | 1 + src/test/test_hs_service.c | 1 + 3 files changed, 8 insertions(+)