commit 868bcc24e512f20492ff21e9267d92e8b9e20128 Merge: 89ead08ee 8e0190d83 Author: teor teor@torproject.org Date: Tue Oct 22 19:43:33 2019 +1000

Merge branch 'ticket32177_035' into ticket32177_040

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