commit d7c40beeab85198a1081dca60201f5e1f265fe13 Merge: c8aa3cc17 63581d55a Author: teor <teor@torproject.org> Date: Fri Oct 25 10:56:13 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 12 ++++++++++-- changes/ticket31919_bionic | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-)