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

[nickm at torproject.org]

commit 6bcb0fb8812774e0714a0e5c1afb3b27acc66bca
Merge: 11c7e65730 ed7f4ad4a9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 7 13:29:49 2021 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.4