commit 110b7a676291ffa1abd924164932c95a0bc536b7 Merge: 13210e93f dbadfe75e Author: teor teor@torproject.org Date: Fri Mar 13 13:01:27 2020 +1000

Merge branch 'maint-0.4.3' into release-0.4.3

.travis.yml | 64 +++++++++++++++++++++++++++++++---------------------- changes/ticket33194 | 4 ++++ changes/ticket33195 | 4 ++++ 3 files changed, 46 insertions(+), 26 deletions(-)