[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/239' into maint-0.3.5

[dgoulet at torproject.org]

commit 290007e3c48624060620b0340c1b4874487aab09
Merge: 02bd135cb1 c4fe66e342
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jan 28 12:42:26 2021 -0500

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

 changes/bug40190             | 4 ++++
 src/core/proto/proto_socks.c | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)