[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

[teor at torproject.org]

commit e56e7e865e148c5017ae20df12c76df0f79e60c1
Merge: 57acdaa3f e03db9934
Author: teor <teor at torproject.org>
Date:   Fri Oct 25 10:55:58 2019 +1000

    Merge branch 'maint-0.3.5' into maint-0.4.0

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