commit db5df1acfd13dce43858f5048fa542423fec004f Merge: 6ef634a77 15d67842f Author: teor teor@torproject.org Date: Tue Oct 29 08:26:36 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

.travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)