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

[nickm at torproject.org]

commit 91c24ad530c896d7bab1e1f485ac092512523243
Merge: 22e72eeaa 8bc3ac6a8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 23 08:44:44 2019 -0400

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