commit 11f1fe3aca08c19ab07d9380c1bd47678c99abc4 Merge: 06c31b1b79 f98b1988ec Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 12 12:29:17 2020 -0400 Merge branch 'maint-0.4.4' .gitlab-ci.yml | 36 ++++++++++++++++------- Makefile.am | 2 ++ scripts/ci/ci-driver.sh | 77 +++++++++++++++++++++++++------------------------ 3 files changed, 67 insertions(+), 48 deletions(-)