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

[nickm at torproject.org]

commit c6c0af403c9b8dccba96677b60d86670a651893d
Merge: da8577bb75 adb7268236
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 11 12:37:08 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.2

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