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

[nickm at torproject.org]

commit 3a9b41895f63ab8fac97c1afbb0be76cc7ead081
Merge: fe4150430 e4f66bf7f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 25 11:56:22 2019 -0400

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