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