commit 3ab58706f775d8e3080a75dfa4b3e5735778d436 Merge: c7d3bedf3 e483257e1 Author: teor teor@torproject.org Date: Thu Oct 17 14:52:02 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

.travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-)