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

[nickm at torproject.org]

commit 68a002c6031f52c97f1d8acbe0c42e53da452351
Merge: 2b97b1464 9e674d0eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 21:28:37 2019 -0400

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