commit 5edc72a45b7479f5fe791054aa19f6b3b478c725 Merge: 2a4439adf e716c9212 Author: Nick Mathewson nickm@torproject.org Date: Tue May 8 14:12:29 2018 -0400

Merge remote-tracking branch 'mikeperry/bug25870_rebase'

changes/bug25870 | 6 ++ doc/tor.1.txt | 16 ++++ src/or/circuitbuild.c | 109 +++++++++++++++++------- src/or/circuitbuild.h | 7 ++ src/or/entrynodes.c | 11 ++- src/or/entrynodes.h | 1 + src/test/test_entrynodes.c | 201 ++++++++++++++++++++++++++++++++++++++++++--- 7 files changed, 307 insertions(+), 44 deletions(-)

diff --cc src/test/test_entrynodes.c index 6af18f8f4,c97aced04..cfcb88a66 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@@ -14,9 -15,9 +15,10 @@@

#include "bridges.h" #include "circuitlist.h" + #include "circuitbuild.h" #include "config.h" #include "confparse.h" +#include "crypto_rand.h" #include "directory.h" #include "entrynodes.h" #include "nodelist.h"