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

[teor at torproject.org]

commit 40d7f1e3a67c7777f44e50e009c313baf686e6b2
Merge: 6d0883e9e 0a661cde1
Author: teor <teor at torproject.org>
Date:   Thu Aug 8 11:19:58 2019 +1000

    Merge branch 'maint-0.4.0' into maint-0.4.1

 .travis.yml         | 8 +++++---
 changes/ticket30591 | 3 +++
 changes/ticket30694 | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)