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

[nickm at torproject.org]

commit 11fbd1f064751e38ccd79e7823adb688b1293e59
Merge: 25729910a bfea7a732
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 9 08:38:59 2020 -0400

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