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

[nickm@xxxxxxxxxxxxxx]

commit b6fb925e99945b40573a96e469117ed2bf9e884f
Merge: 6753b804e4 02bb719a94
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Aug 12 12:29:17 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits