commit ab58dd15774382689dd0c2a003d1a3dbaf2d9b5d Merge: 7ae74203e1 8f13257ccd Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:02:43 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(-)