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

[nickm at torproject.org]

commit 3483d6aab5fc8c4c090ffce8cc88586b650ed57b
Merge: a42e58a284 ec0b4bdafd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 7 09:39:45 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6
    
    "ours" to avoid version bump.