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

commit 5a822b462aaa8cf3cd749c253bb1e9e5f4f37fa2 Merge: 77bb4b0838 4b39f46a61 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.3' into maint-0.4.4

changes/40241 | 4 ++++ src/core/or/channeltls.c | 3 ++- src/core/or/circuitlist.c | 2 ++ src/feature/client/entrynodes.c | 2 ++ src/feature/rend/rendclient.c | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-)