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

[nickm at torproject.org]

commit f954514b376e6edbe8b1faba0726bdb46acf7729
Merge: d04b708b4 79ff2b6aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 6 16:53:06 2020 -0400

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