[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.3

[dgoulet at torproject.org]

commit f058db1f3d6fee5bc6506ece88cfd100eb86729d
Merge: f3da5f88d7 290007e3c4
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jan 28 12:42:31 2021 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.3

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