commit 9c63b3b0c22f67e059d9c9dcb22ce0d8efc0512a Merge: 1fdfa8eeed a6533af9e8 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 15 08:54:00 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

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