commit 16b830ed52e70e9d1b4e808f88970003fc2a45f6 Merge: 561ba475e9 7d80bf80fe Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 10 19:33:07 2020 -0400
Merge branch 'maint-0.4.4' into release-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(-)