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

[nickm at torproject.org]

commit 5fac24053d1615260a4ee437a9686c82262e47a8
Merge: f2cfd1ffad 3271c0bde7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 16 09:17:40 2021 -0400

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