commit efb174df242adf964e383381d31b891c5f535f1f Merge: 8e4965aa36 7c5a67ccd9 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 15 08:52:53 2021 -0400

Merge branch 'maint-0.4.5'

changes/ticket40286_minimal | 5 +++++ src/feature/dirparse/unparseable.c | 6 ++++++ 2 files changed, 11 insertions(+)