[tor-commits] [tor/release-0.4.6] Merge branch 'tor-gitlab/mr/140' into maint-0.3.5

[dgoulet at torproject.org]

commit 8f13257ccd99772473949200e72e90ba2dd419a1
Merge: 2cf1365c17 248cbc2d22
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jan 28 12:02:39 2021 -0500

    Merge branch 'tor-gitlab/mr/140' into maint-0.3.5

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