Merge remote-tracking branch 'mikeperry/bug25870_rebase'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/circuitbuild.c
Simple merge

diff --cc src/or/entrynodes.c
Simple merge

diff --cc src/test/test_entrynodes.c
index 6af18f8f4f80cee8c34b12cf6a3892bb9725f30c,c97aced04288840ae45538808ec78a3a3b83dd9c..cfcb88a66e66c696b430a6a4c87ff0ddf4f76929
--- 1/src/test/test_entrynodes.c
--- 2/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"