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

[teor at torproject.org]

commit 2395800d3e333ec4637ece4bee0a0a1af81c0cbc
Merge: d7c40beea 63aff4a43
Author: teor <teor at torproject.org>
Date:   Tue Oct 29 08:26:55 2019 +1000

    Merge branch 'maint-0.4.1' into maint-0.4.2

 .travis.yml         | 7 ++++---
 changes/ticket32241 | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)