commit 61d66c8cb5e26731bec34b0b645787643da9f1f0 Merge: 6999a05008 be81ecba3a Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:42:32 2021 -0500

Merge branch 'maint-0.4.4' into release-0.4.4

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