commit 1f39a13d1459e64bf861174f0f5d49d04f7c06fa Merge: 869fa2a2ef 8f13257ccd Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:02:43 2021 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug40117 | 5 +++++ src/feature/rend/rendmid.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-)