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

[nickm at torproject.org]

commit 38bfb3cdfee3e62c94b9d2bb41f745ac643002ae
Merge: 0ceacb5482 a4a3721690
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 21 10:34:28 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6