commit aff286618c1c0f76796f10004e0834896470aa61 Merge: a91f52a44 d7c40beea Author: teor teor@torproject.org Date: Fri Oct 25 10:56:21 2019 +1000

Merge branch 'maint-0.4.2'

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