commit f3fcc89d055811065bd9fe723b4d71b755b82edc Merge: 39d5e7c764 68f8250cbb Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 10 19:33:06 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

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