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

[asn at torproject.org]

commit 5a73f369dbd4d19ced536f4862b12ef98d6a2002
Merge: 7c92f4faa 357e9a6f2
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 27 11:49:36 2019 +0300

    Merge branch 'maint-0.4.0' into maint-0.4.1