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

[nickm at torproject.org]

commit d925d2995c6b11e4fea3a0637544c23b0b90ff95
Merge: 84f57b69f 190cda0e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 18 12:17:20 2020 -0400

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