commit 8f8e1523e0cdf00570edcaa51f4c8564f263202e Merge: 446912854 d7c40beea Author: teor <teor@torproject.org> Date: Fri Oct 25 10:56:17 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 .travis.yml | 12 ++++++++++-- changes/ticket31919_bionic | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-)