commit 82cef8032b2a1d4c47c2e1f8ee540b3e04c0b05d Merge: 28c05e0ec 14089a29b Author: teor teor@torproject.org Date: Tue Dec 3 12:46:54 2019 +1000

Merge branch 'maint-0.4.1' into release-0.4.1

.travis.yml | 14 +++++++++----- changes/ticket32500 | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-)