commit 28e708fcbc80d181367bc76553eb6a4325372bb7 Merge: 09a3bd1ff 1cd20ff84 Author: teor teor@torproject.org Date: Mon Dec 16 08:16:00 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

.travis.yml | 9 +++++---- changes/ticket32629 | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-)