commit 5f00c03ed0327917409b074b99b7509c26128617 Merge: c3e94a8cc 9e674d0eb Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 21:28:38 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

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