commit a6533af9e8d90fda13180064e98b49ac3c3cdf86 Merge: 7c5a67ccd9 2eb900f7e2 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 15 08:54:00 2021 -0400

Merge branch 'maint-0.4.4' into maint-0.4.5

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