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

[nickm at torproject.org]

commit 4c40cf41671ba7d3577216d22353f7c90e948943
Merge: 05aab3fd2 f0646919a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 10 10:28:30 2020 -0400

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