commit cac7c6625fcc94fcbb8d3ff0322735d55fb40538 Merge: 84b84b243 e83eabc9b Author: teor teor@torproject.org Date: Thu Aug 8 11:19:34 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

.travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-)