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

[ahf at torproject.org]

commit dbb70d85bf65d33e0a1035146d71a2a610e91056
Merge: 881f50a9a 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 maint-0.4.2

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