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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.3' into maint-0.4.4

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