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

[nickm at torproject.org]

commit 944bdde50edbc6030dfc954ff501c92cd9e73fb0
Merge: 5d4005abf b7d18f861
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 9 16:04:09 2019 -0500

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