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

[nickm at torproject.org]

commit da8577bb7579af1355688d459b2774f995c43b53
Merge: e4a6d9d5a9 aa2c93b90b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 11 11:03:24 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.2

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