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

[nickm at torproject.org]

commit e2138627f9b52e9e8aa93387e17f37f3a21d5efd
Merge: b5eb1ba722 f57b5c48e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 10 12:30:29 2021 -0400

    Merge branch 'maint-0.3.5' into release-0.3.5

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