[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.1

[nickm at torproject.org]

commit dd0ee016e9e386410c374d0dd421f5683ec8476e
Merge: 28f453c47 cc397449f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 16:51:33 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.1
    
    This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.