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

[nickm at torproject.org]

commit 0fb407591b8e5e028884aa6e07b7b1550bd0c703
Merge: 7b6be02a9 ec7f99e6e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 29 19:42:43 2020 -0500

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