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

[nickm at torproject.org]

commit 2f4fa423c30c81092f06fb97c20f5d281b3cfac7
Merge: 2c1a49c46 7a9e2a261
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 13 16:57:03 2020 -0400

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