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

[nickm at torproject.org]

commit 17561434ebcf01eaa86737b2acfb65df8b57a8b5
Merge: 3248630fc 7174a80ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 9 16:03:01 2019 -0500

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