commit 0d63b19afaecbba9ba66afb7d3aad0329c670cf9 Merge: ba2ee8ae3b 218f9f90fb Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 13 09:41:13 2021 -0400

Merge branch 'maint-0.4.5'

changes/ticket40360 | 5 +++++ src/feature/client/entrynodes.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-)