commit 7d80bf80fe9017e04fff4b588f49d0393332ebee Merge: c1b440f760 f3fcc89d05 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 10 19:33:07 2020 -0400

Merge branch 'maint-0.4.3' into maint-0.4.4

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