commit 58ad0302ea9acea48308f35dce4afa986919a151 Merge: 5481412cd7 8e590992c4 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 10 12:30:29 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/bug40392 | 4 ++++ src/feature/hs/hs_descriptor.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)