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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.2' into maint-0.4.3

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