commit 28bbe09b80cc0c18f71a51603469bf211bfe2a12 Merge: 1f54007161 68f8250cbb Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 10 19:33:06 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

.gitlab-ci.yml | 120 ++++++++++-- scripts/ci/ci-driver.sh | 424 ++++++++++++++++++++++++++++++++++++++++++ src/feature/rend/rendclient.c | 4 +- 3 files changed, 533 insertions(+), 15 deletions(-)