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

[ahf at torproject.org]

commit 34ca6b133710d3d2ac75debcbc4005585a2c2656
Merge: 62727a4ad 8697205be
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue Jun 30 14:23:41 2020 +0000

    Merge branch 'maint-0.3.5' into release-0.3.5

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