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

[nickm at torproject.org]

commit 34919368cebb1e635d10694d8ec42911db909130
Merge: 309eafbc3c 07f0210a05
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 12 20:21:04 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml          | 34 +++++++++++++++++++++++++++++-----
 scripts/ci/ci-driver.sh | 34 +++++++++++++++++++++++-----------
 2 files changed, 52 insertions(+), 16 deletions(-)