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

[dgoulet at torproject.org]

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

    Merge branch 'maint-0.3.5' into release-0.3.5

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