commit 1451861cd2c68bb47faad34c5185c29d4075612f Merge: 5e04311873 200e9a55e0 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 10 12:30:29 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 changes/bug40392 | 4 ++++ src/feature/hs/hs_descriptor.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)