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

[nickm at torproject.org]

commit f94ad3d32a92f3709df37ae06b57ca47616a552f
Merge: cff2c3d5fa 309eafbc3c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 12 12:29:17 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

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