[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/140' into maint-0.3.5

[dgoulet at torproject.org]

commit 045db909c2128b11b3ea02fadd0d1fce974e32e7
Merge: c6fb26695b 248cbc2d22
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jan 28 12:08:14 2021 -0500

    Merge remote-tracking 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(-)