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

[nickm at torproject.org]

commit 9b307664512ed695108a3bf890ec3d14baa86b1f
Merge: 7793ccdee d925d2995
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 18 12:17:32 2020 -0400

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