commit 7d833ee33458d93adaeeccbb88cce98738a96f6a Merge: 511e1cfde dbb70d85b Author: Alexander Færøy ahf@torproject.org Date: Tue Jun 30 14:23:41 2020 +0000

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