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

[nickm at torproject.org]

commit d1f474160638e10478a2ab14fb93b1e8b6a720a2
Merge: edc9fda4f5 5a822b462a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 11 14:37:29 2021 -0500

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