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

[nickm at torproject.org]

commit 202a57e45834a4a3a6c551b96b801b3ef1af1954
Merge: e96bd196a 2e80d7f19
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 13 17:02:38 2020 -0400

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