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

[nickm at torproject.org]

commit 68e1ced607eaed3105b4b3967e2f6af5070da0e4
Merge: d0c97bf3b 570d1367e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 24 15:55:38 2019 -0400

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