commit 94fef11c24447278726c335e8798f8affde97545 Merge: 6bd94c8a47 85a1e6c601 Author: David Goulet dgoulet@torproject.org Date: Tue Sep 8 11:14:12 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

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