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

[teor at torproject.org]

commit 9014add25fd7bf4fa83e4409ab5d7b4416c872cc
Merge: f0e39df5c 9242f3288
Author: teor <teor at torproject.org>
Date:   Tue Apr 2 11:45:39 2019 +1000

    Merge branch 'maint-0.4.0'

 changes/bug29703 | 4 ++++
 1 file changed, 4 insertions(+)