commit ee14fae8a7ce9e3f4199ad97f90a1cff6f71e4fc Merge: 7d4049fa9e ab58dd1577 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:02:43 2021 -0500

Merge branch 'maint-0.4.3' into release-0.4.3

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