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

[teor at torproject.org]

commit e3012d5e3773b4ee8e15a7c4c57f5a7a534a918d
Merge: b10646705 bed439013
Author: teor <teor at torproject.org>
Date:   Tue Oct 22 20:48:00 2019 +1000

    Merge branch 'maint-0.3.5' into release-0.3.5

 .travis.yml         | 12 +++++++-----
 changes/ticket32177 |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)