[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

[teor at torproject.org]

commit e3e38b5ba1033512791ecae2a01278300c75c3c4
Merge: 571a7d591 ca29cb397
Author: teor <teor at torproject.org>
Date:   Wed Mar 27 10:02:51 2019 +1000

    Merge branch 'maint-0.4.0' into release-0.4.0