commit 4a34fd5b746fcbd712607323cb48cfcd6e72456f Merge: ffccf6fc5 e2f78396f Author: teor teor@torproject.org Date: Mon Dec 16 09:14:38 2019 +1000

Merge branch 'bug32240_040' into bug32240_041

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