commit febbc236d4a813bf086c5cc3dcd0fa93c7f3eab1 Merge: 055f5d4d1 62cf12a8b Author: teor teor@torproject.org Date: Tue Dec 3 12:46:43 2019 +1000

Merge branch 'maint-0.3.5' into maint-0.4.0

.travis.yml | 14 +++++++++----- changes/ticket32500 | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-)