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

commit 33f14fc6d35710a8dc69fb2401191bf10d360f30 Merge: 9b654b95ec 4b39f46a61 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 11 14:37:29 2021 -0500

Merge branch 'maint-0.4.3' into release-0.4.3

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