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

[teor at torproject.org]

commit 88276ee02c10c202a88766707ecb5e92858270ad
Merge: cac910c42 0a661cde1
Author: teor <teor at torproject.org>
Date:   Thu Aug 8 11:19:50 2019 +1000

    Merge branch 'maint-0.4.0' into release-0.4.0

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