commit 87944cecfc2e313f6514109301f12d1b3bc93f0b Merge: 41261c3b5 670d40262 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 12 08:50:09 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1300'

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