commit 23e1c1c35c1778823498db29e6248e06082a925c Merge: 28e708fcb 0b3763612 Author: teor teor@torproject.org Date: Fri Dec 20 10:12:35 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

.travis.yml | 10 ++++------ changes/ticket32240 | 4 ++++ changes/ticket32242 | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-)