commit 63aff4a43e0ed2b50632beb4e630f2504881538e Merge: 63581d55a 54e2d0dc2 Author: teor teor@torproject.org Date: Tue Oct 29 08:26:48 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

.travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)