Merge branch 'maint-0.4.7'
commit28dfa070698f0eafe1c26a3df3dcf96488ce6635
authorDavid Goulet <dgoulet@torproject.org>
Mon, 24 Jul 2023 14:18:53 +0000 (24 10:18 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 24 Jul 2023 14:18:53 +0000 (24 10:18 -0400)
treecdbe13a1731e0aaba14bb2a6c8586337ec708968
parente6a9e006907cddf380d3c528757e1d41c4171884
parentd6fd7d10352aae85ab5364efce6136b8b31108ca
Merge branch 'maint-0.4.7'
src/feature/hs/hs_descriptor.c
src/feature/hs/hs_descriptor.h