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

[nickm at torproject.org]

commit cd4ae97448ea503111d6f235624a4594f7ff3470
Merge: fc1316b55 70755eca0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 12 16:39:44 2019 -0500

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