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

[dgoulet at torproject.org]

commit 6e83db69a9d7e6c3d940b1eb7584587045961e52
Merge: 53b08a1158 a160a9ec30
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Oct 6 15:41:17 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6