[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[nickm at torproject.org]

commit 77733021e654e5a17d59938a1e33c986c317ea7c
Merge: 465a63c5f 02840169d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 21:28:37 2019 -0400

    Merge branch 'maint-0.3.5' into release-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(-)