commit be81ecba3a770690d949aa0b71a8e88c90752199 Merge: a3f2bc8f13 f058db1f3d Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:42:31 2021 -0500

Merge branch 'maint-0.4.3' into maint-0.4.4

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