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

[teor at torproject.org]

commit 4c22c11136bd05cceccb13ef00f2a78780c83be1
Merge: 0aaeec19e b4483edce
Author: teor <teor at torproject.org>
Date:   Tue Mar 19 15:43:42 2019 +1000

    Merge branch 'maint-0.4.0'

 changes/bug29530_035 | 5 +++++
 1 file changed, 5 insertions(+)