[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[teor at torproject.org]

commit 5f3233ce1a1fb91c36354cf6c2668b687638c707
Merge: e6bb23434 8ac9af233
Author: teor <teor at torproject.org>
Date:   Thu Oct 17 14:52:19 2019 +1000

    Merge branch 'maint-0.4.2'

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