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

[dgoulet at torproject.org]

commit a160a9ec30e11fe99ec60a072416b8bf74d39018
Merge: 474c85a98d 065ebd10c2
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Oct 6 15:41:17 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6