[tor-commits] [tor/master] Merge branch 'ticket32177_040' into ticket32177_041

[teor at torproject.org]

commit 86b1714731f0e2679be4ab1a8aa7cb62730ba4bb
Merge: 53aa15963 868bcc24e
Author: teor <teor at torproject.org>
Date:   Tue Oct 22 19:43:38 2019 +1000

    Merge branch 'ticket32177_040' into ticket32177_041

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