commit 9343b4120001ce788d11eae0d7f41340e93f044c Merge: 79105b55b 752c35ca9 Author: teor teor@torproject.org Date: Tue Oct 29 08:26:28 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

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