commit 4eb55297d38cab682a7ccf0fcb6b15a9b8f85a4b Merge: e188e02f2 63581d55a Author: teor teor@torproject.org Date: Fri Oct 25 10:56:10 2019 +1000

Merge branch 'maint-0.4.1' into release-0.4.1

.travis.yml | 12 ++++++++++-- changes/ticket31919_bionic | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-)