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

[nickm at torproject.org]

commit 8d59897e58ab5c79cf7b981d05b8244a68eaf9ac
Merge: 85cfd04c0 c0dd2a6e3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 15 09:02:30 2020 -0400

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