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

[nickm at torproject.org]

commit 09b4c73fe499c185bcdddb40e949185a51003d40
Merge: 494ced690d fd22fa183b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 12 08:12:20 2020 -0500

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