commit 262906e99430f41012f4d699d2ac3eecf3a8c1dd Merge: c4eb6740f d96b35d66 Author: teor teor@torproject.org Date: Fri Dec 20 10:12:39 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

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