commit f46f4562cf6f47fe6c00752f61b04dc18a454253 Merge: 1a0b5fd569 ede88c374c Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 15 08:41:03 2021 -0400

Merge branch 'bug40286_disable_min_035' into maint-0.3.5

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