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

[nickm at torproject.org]

commit 9e674d0eb4d83caab5298e83c837ebd58b0f5d3d
Merge: a1f97bb25 02840169d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 21:28:37 2019 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.0

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