commit 72376378714fef727004830157da79be97821a60 Merge: ffccf6fc5 d96b35d66 Author: teor teor@torproject.org Date: Fri Dec 20 10:12:43 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

.travis.yml | 10 ++++------ changes/ticket32240 | 4 ++++ changes/ticket32242 | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-)