[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5

[teor at torproject.org]

commit 05908d57f64a4365f6715f19aba51ccd5849e635
Merge: 0c4f0ec97 a277f2894
Author: teor <teor at torproject.org>
Date:   Mon Dec 16 08:14:04 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5

 .travis.yml         | 9 +++++----
 changes/ticket32177 | 3 ---
 changes/ticket32629 | 4 ++++
 3 files changed, 9 insertions(+), 7 deletions(-)