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

[dgoulet at torproject.org]

commit 878b067c69c1e40b8a0abd55bee63b15f270d706
Merge: 6a167d2123 4a77aa6e82
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Dec 15 11:58:22 2020 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

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