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

[nickm at torproject.org]

commit 938d97cb0d4acfdd1ea57ec0a3094bcc2101f13d
Merge: ca2656704 ebc7556dd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 21 09:36:40 2019 -0400

    Merge branch 'maint-0.4.0'
    
    Ours to avoid version bump.