commit e0caedee163b6861dc2e6be23a4e21c39503172d Merge: 498807b499 5a822b462a Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 11 14:37:29 2021 -0500

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