commit 13daf339a903da74051ac9d51d8bb5b386be64f8 Merge: 4dcbbe416 e5dda7f66 Author: teor teor@torproject.org Date: Thu Oct 17 14:51:02 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1

.travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-)