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