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

[dgoulet at torproject.org]

commit 792151e4f42464195943169374b4a3bcb37225d1
Merge: e6ef22ca15 a4a3721690
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 21 10:34:28 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5