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

[teor at torproject.org]

commit a00b9e5a86dd763e8d21958dc9022472f40a18d8
Merge: 26071aa3b 349554f40
Author: teor <teor at torproject.org>
Date:   Sun Dec 1 20:26:55 2019 +1000

    Merge branch 'ticket32629_040' into ticket32629_041

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