commit d5702a6340104434fe1d82a340c74b2393a1f8aa Merge: ee4375a98 bd11fb109 Author: teor teor@torproject.org Date: Mon Dec 16 08:16:24 2019 +1000

Merge branch 'maint-0.4.2' into release-0.4.2

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