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

[teor at torproject.org]

commit e483257e1bc826b5678fcbf13084fd5d811f2b12
Merge: a74c18069 4b8e5ea0d
Author: teor <teor at torproject.org>
Date:   Thu Oct 17 14:51:58 2019 +1000

    Merge branch 'maint-0.3.5' into maint-0.4.0

 .travis.yml         | 87 +++++++++++++++++++++++------------------------------
 changes/ticket30860 |  3 ++
 changes/ticket31859 |  3 ++
 3 files changed, 43 insertions(+), 50 deletions(-)