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

[dgoulet at torproject.org]

commit e44f01f5a8db70a676512043b25eb4ccca8dac44
Merge: e5ea02a662 f058db1f3d
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jan 28 12:42:31 2021 -0500

    Merge branch 'maint-0.4.3' into release-0.4.3

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