[tor-commits] [tor/master] Merge branch 'bug33195_043' into bug33195_master

[teor at torproject.org]

commit c34c101212014f84a8cde3752c198e772f410da7
Merge: e231d84dd 3e8e4af1a
Author: teor <teor at torproject.org>
Date:   Thu Feb 13 14:22:18 2020 +1000

    Merge branch 'bug33195_043' into bug33195_master

 .travis.yml         | 64 +++++++++++++++++++++++++++++++----------------------
 changes/ticket33194 |  4 ++++
 changes/ticket33195 |  4 ++++
 3 files changed, 46 insertions(+), 26 deletions(-)