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

[nickm at torproject.org]

commit 39bb283fca95648aeb58d9e8927de6e1530c6015
Merge: 37d1ee554 0a33522b6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 5 13:32:40 2019 -0500

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