commit 7d6e9d7d95be2d6ec8b4af8d7b6685508c7eda1c Merge: 78ac7c751 42e56f5ba Author: David Goulet <dgoulet@torproject.org> Date: Mon Mar 30 13:38:57 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug31669 | 4 ++++ src/feature/hs/hs_descriptor.c | 14 ++++++++++++-- src/test/test_hs_descriptor.c | 26 ++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-)