[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

[nickm at torproject.org]

commit 200e9a55e0737294085080052fbbaba4340d6717
Merge: ae2254e490 0ae9fd62fd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 12:30:29 2021 -0400

    Merge branch 'maint-0.4.4' into maint-0.4.5

 changes/bug40392               | 4 ++++
 src/feature/hs/hs_descriptor.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)