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

[nickm at torproject.org]

commit 5aceb7ca192b42fe1cdd940465a6ee2655d47cd5
Merge: 6cd23b29d2 6c0f15500b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 11 14:37:28 2021 -0500

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