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

[nickm at torproject.org]

commit 2933c371887d07704fd6101b82302a8b952d638c
Merge: f3ba71bbee 8a17999da3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 3 13:39:28 2021 -0500

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