[tor-commits] [tor/master] Merge branch 'ticket40241_035' into maint-0.3.5

commit 6c0f15500b3aa027c90d1c397d4504bb2f4dd41b Merge: fcae26adf7 ccdbbae4ec Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 11 14:37:14 2021 -0500

Merge branch 'ticket40241_035' into maint-0.3.5

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(-)