commit 752c35ca9673c91a9edff84f2efaabe4d04c9c60 Merge: 93be7275e 14b197a14 Author: teor teor@torproject.org Date: Tue Oct 29 08:23:35 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9

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