[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/459' into main

[ahf at torproject.org]

commit 8c18e9a949a76f53b7892739205bf29a8c020224
Merge: b93af906c4 15ede0435f
Author: Alexander Færøy <ahf at torproject.org>
Date:   Thu Oct 14 19:19:32 2021 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/459' into main

 changes/bug40486                | 5 +++++
 src/feature/client/entrynodes.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)