commit 4a77aa6e8248f06e17a9a7375076b9d685a6b789 Merge: c731a4efec c4fe66e342 Author: David Goulet <dgoulet@torproject.org> Date: Tue Dec 15 11:58:13 2020 -0500 Merge branch 'tor-gitlab/mr/239' into maint-0.4.5 changes/bug40190 | 4 ++++ src/core/proto/proto_socks.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-)