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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.2' into release-0.4.2

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