commit e748c1d1e7bd098cfbbf97aabb97e76d2c4c720b Merge: 1279db39eb e873c7e893 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 10 19:31:56 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

.gitlab-ci.yml | 120 ++++++++++-- scripts/ci/ci-driver.sh | 424 ++++++++++++++++++++++++++++++++++++++++++ src/feature/rend/rendclient.c | 4 +- src/lib/net/address.c | 2 +- 4 files changed, 534 insertions(+), 16 deletions(-)