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

[nickm at torproject.org]

commit 142612bd16f47c9ebe9ac50bc394b07c1026574b
Merge: eb021e8c6 d8264ab62
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 25 21:52:02 2019 -0400

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