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

[teor at torproject.org]

commit 24b68b4777225436c1f5f820e79a6a76ee973313
Merge: 6a179b107 231036a11
Author: teor <teor at torproject.org>
Date:   Fri Apr 19 12:00:50 2019 +1000

    Merge branch 'maint-0.3.5' into maint-0.4.0