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

commit 69d7ea4db963155e6133bc724d4639ea1bd31d1c Merge: 7c2e1f6dd 723763787 Author: teor <teor@torproject.org> Date: Fri Dec 20 10:12:47 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 .travis.yml | 10 ++++------ changes/ticket32240 | 4 ++++ changes/ticket32242 | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-)