commit 07db4141abb228bc6848e520b6faa75b0015af72 Merge: 9e674d0eb 632e70739 Author: teor teor@torproject.org Date: Tue Oct 1 23:46:28 2019 +1000

Merge branch 'bug31859_035' into bug31859_040

.travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-)