commit 02bb719a9494a010b3cad4cf81942ec7619f5806 Merge: 6ef40144ae f5b9471547 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

.gitlab-ci.yml | 36 ++++++++++++++++------- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 77 +++++++++++++++++++++++++------------------------ 3 files changed, 67 insertions(+), 48 deletions(-)