commit 86ca3194aac91d8558a0269e3ef341b07c2b1602 Merge: 5082eeba3 da404910a Author: teor teor@torproject.org Date: Mon Dec 16 09:17:02 2019 +1000

Merge branch 'bug32240_042' into bug32240_master

.travis.yml | 7 +++---- changes/ticket32240 | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-)