commit 664a2c0755156bce2947338bf08edc1f02326e1d Merge: d5702a634 5dbb607e9 Author: teor teor@torproject.org Date: Fri Dec 20 10:12:55 2019 +1000

Merge branch 'maint-0.4.2' into release-0.4.2

.travis.yml | 10 ++++------ changes/ticket32240 | 4 ++++ changes/ticket32242 | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-)