commit 1b3c206cf3f88792d6a78fc50b263fc145f910ea Merge: 16d5201af1 f98b1988ec Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

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