[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9

[teor at torproject.org]

commit c660f479608aa6be68929bb6f4cbeee87c5521cc
Merge: 90de776ea 1e0e23c1e
Author: teor <teor at torproject.org>
Date:   Thu Oct 17 14:49:52 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9

 .travis.yml         | 58 ++++++++++++++++++++++-------------------------------
 changes/ticket30860 |  3 +++
 changes/ticket31859 |  3 +++
 3 files changed, 30 insertions(+), 34 deletions(-)