commit c4eb6740f9e36fca9f2fdd4ea1620047ad67b045 Merge: 793c4a3c9 748117298 Author: teor <teor@torproject.org> Date: Mon Dec 16 08:16:08 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 .travis.yml | 9 +++++---- changes/ticket32629 | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-)