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

commit d63278b1d16afd29cf96e057146fe3f755e3234b Merge: d4253bbea0 d1f4741606 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.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(-)