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

[nickm at torproject.org]

commit 39bd10dca65fb4007a3da2a15323e6a8bebfd0aa
Merge: 847fc3280 cafb99981
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 30 15:54:03 2019 -0400

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