commit ffccf6fc55f691e01ccd3e756486415cbc7ffe8a Merge: 7174a80ed 748117298 Author: teor teor@torproject.org Date: Mon Dec 16 08:16:12 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

.travis.yml | 9 +++++---- changes/ticket32177 | 3 --- changes/ticket32629 | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-)