commit 75873c1a302c62f8d0510d69530ed3408a2d245a Merge: 36ae644fc 1c688ba92 Author: teor teor@torproject.org Date: Mon Mar 16 20:54:16 2020 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

.travis.yml | 2 +- changes/ticket32792 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)