commit 2b1c08567d7ced8c188d5e195598158a214fcc99 Merge: 72a0cdb1cd efca9ce41c Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 15 08:54:00 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

changes/ticket40286_minimal | 7 ++++--- src/feature/dirparse/unparseable.c | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-)