commit 9c268b66ba72203aa2fc7e5c58b35cc883712886 Merge: d31beeef9f d1f4741606 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 11 14:46:13 2021 -0500

Merge branch 'maint-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(-)