[tor-commits] [tor/master] Merge branch 'ticket32629_035' into ticket32629_040

[teor at torproject.org]

commit 349554f40d503a33f4b85c8481ca1434ac07acbf
Merge: 055f5d4d1 6558bb446
Author: teor <teor at torproject.org>
Date:   Sun Dec 1 20:26:51 2019 +1000

    Merge branch 'ticket32629_035' into ticket32629_040

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