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

[nickm at torproject.org]

commit 494ced690d4db09b5660472df490f9c8512c2684
Merge: 210a94b231 3d3dc08ed8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 9 17:13:41 2020 -0500

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