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

[dgoulet at torproject.org]

commit 676381940e340f284488efc43c8c3e63e006ea37
Merge: d4f68f1c69 89073bda5f
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Oct 28 10:38:20 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6