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

[nickm at torproject.org]

commit 84fc0c579b0ffa87b618cf533532d0c13e064c32
Merge: 077c71650 5f00c03ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 21:28:38 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

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