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

[asn at torproject.org]

commit 79d777396858d008bb99d0f411953a5152b921b0
Merge: 020e8e41c6 faf89ec6c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 28 10:35:12 2020 -0400

    Merge branch 'maint-0.3.5' into bug40133_035

 .gitlab-ci.yml                               | 73 +++++++++++++++++++++++++++-
 changes/ticket40125                          |  4 ++
 changes/ticket40126                          |  4 ++
 changes/ticket40135                          |  3 ++
 scripts/ci/ci-driver.sh                      | 25 ++++++++++
 src/feature/hs_common/shared_random_client.c |  4 --
 src/test/test_rendcache.c                    |  3 ++
 7 files changed, 111 insertions(+), 5 deletions(-)