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

[nickm at torproject.org]

commit 9ac8c854354eac7178eb8e99384f34c5a7abd5f4
Merge: 658770a0f 1bff5646e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 21 13:25:54 2019 -0500

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