commit 14089a29b54f1bc46ca0ff263abdc152f013051a Merge: 26071aa3b febbc236d Author: teor teor@torproject.org Date: Tue Dec 3 12:46:50 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

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