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

[nickm at torproject.org]

commit 0ec2d1528cc8f80fe134c37961f8724696468aa9
Merge: 6bee9bd481 c6c0af403c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 11 12:37:08 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml          |  5 +++--
 scripts/ci/ci-driver.sh | 27 ++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)