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

[nickm at torproject.org]

commit 6bee9bd48169f23a3ce713dd30d6b8e2681fa127
Merge: 262ddfee7a da8577bb75
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 11 11:03:24 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3

 scripts/ci/ci-driver.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)