[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/ticket21349_4'

[nickm at torproject.org]

commit 13393b2d913545aec54d17fb3402906ab4e04ad7
Merge: b8e94b2f1 e9f6f742b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 30 08:49:49 2018 -0400

    Merge remote-tracking branch 'rl1987/ticket21349_4'

 changes/ticket21349             |   6 +
 src/feature/client/entrynodes.c | 324 +++++++++++++++++++++++++++-------------
 src/lib/container/smartlist.c   |  27 ++++
 src/lib/container/smartlist.h   |   3 +
 4 files changed, 256 insertions(+), 104 deletions(-)