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