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

[nickm at torproject.org]

commit 5e771327afb49a202044a33741f54abf897fe402
Merge: 433f526af6 fb2c889a38
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 15 07:40:56 2021 -0400

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