[tor-commits] [tor/maint-0.3.5] Merge branch 'tor-github/pr/1909' into maint-0.3.5

[ahf at torproject.org]

commit 8697205be400e560c7ae4083d7febd7aa593e61a
Merge: 8444fbe90 39f2411b3
Author: Alexander Færøy <ahf at torproject.org>
Date:   Tue Jun 30 14:23:17 2020 +0000

    Merge branch 'tor-github/pr/1909' into maint-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(-)