commit 4f2257477c2b35a25577b7b4fd50461811204a7d Merge: 65187d9de c22696e36 Author: teor <teor@torproject.org> Date: Mon Mar 16 20:54:24 2020 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 .travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)