commit 14ba43f92edf54343c7358d7c32f5f0993c9a5ae Merge: 73b18f1f1 511aeba8e Author: teor teor@torproject.org Date: Tue Oct 22 20:46:08 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

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