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

[teor at torproject.org]

commit a2af6e2b1dbf09c88dd24c6803238e99485dce21
Merge: 996cbdac3 4b8e5ea0d
Author: teor <teor at torproject.org>
Date:   Thu Oct 17 14:51:54 2019 +1000

    Merge branch 'maint-0.3.5' into release-0.3.5

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