commit 5c4ec3f335da2fe983710a51754b77fed4c91d2d Merge: 8ef4c78bd 40d7f1e3a Author: teor teor@torproject.org Date: Thu Aug 8 11:20:03 2019 +1000

Merge branch 'maint-0.4.1' into release-0.4.1

.travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-)