commit b3478a8856cc54158fdfe0f19818e6552883d161 Merge: b4e1dc747 f98b59524 Author: teor teor@torproject.org Date: Tue Oct 22 20:48:26 2019 +1000

Merge branch 'maint-0.4.2'

.travis.yml | 12 +++++++----- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-)