commit 6186288eb639e7600c9d7ab482135d44ed78fe21 Merge: a17be1b5b6 045db909c2 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:08:20 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

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