commit 6ef634a7754f876a43b0dfbd0e91215b13569cf9 Merge: 4961a0ae9 e03db9934 Author: teor teor@torproject.org Date: Fri Oct 25 10:55:55 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

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