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

[asn at torproject.org]

commit 7c7e2e2fea662577ecf129e5dce409125a9683fd
Merge: bd61a36fd 6b05d447b
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Jun 2 14:05:42 2020 +0300

    Merge branch 'maint-0.4.3' into release-0.4.3

 changes/bug34303                | 5 +++++
 src/core/or/circuitlist.c       | 2 +-
 src/feature/client/entrynodes.c | 8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)