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

[nickm at torproject.org]

commit ceb5735652326f053d4e18c76549b1ce1770a0b7
Merge: 3c0d398847 f8fea8b979
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 28 11:19:23 2021 -0500

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