commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5 Merge: 02bb719a94 aeafb7f44f Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

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