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

[nickm at torproject.org]

commit f06e08e4d69132279c1151aeecb5fc8fa0b70205
Merge: 28bbe09b80 e4a6d9d5a9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 11 10:44:40 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

 .gitlab-ci.yml          | 5 +++++
 scripts/ci/ci-driver.sh | 5 +++++
 2 files changed, 10 insertions(+)