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

[nickm at torproject.org]

commit db1065403ddabacd7c67273bff30f027151fb142
Merge: cfa9cc34a e66533bef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 5 13:31:17 2019 -0500

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