[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5

[nickm at torproject.org]

commit 02840169d860384257042bdf6d7601c2bf48b47b
Merge: 50b45c43e 670d40262
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 21:28:29 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5

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