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

[dgoulet at torproject.org]

commit 3ebf21700988132f5936383840a323bb4cab39dc
Merge: f5bd575401 92fedb9f44
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Oct 29 09:20:21 2021 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.5