commit 7c2e1f6ddd116eefc9f65f0536a5f3b1f5735966 Merge: 9fc50f057 ffccf6fc5 Author: teor teor@torproject.org Date: Mon Dec 16 08:16:16 2019 +1000

Merge branch 'maint-0.4.1' into release-0.4.1

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