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

[nickm at torproject.org]

commit 7ed0fbd88572b9f5519e7907f366c54b8ffb0f25
Merge: 641dce2d6b 3ebf75993f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 28 11:17:43 2021 -0500

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