Merge branch 'bug25903_v5_squashed'

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

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

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

diff --cc src/or/or.h
Simple merge

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

diff --cc src/or/rendcommon.c
index 3a7dfe28f89eb71d2af0b345b7d84fa2deae9281,2a77b2ece76f971167f6d31375a6d522bdd55120..f3fa2f64d137a2de9bb64096e0863d52a308da33
--- 1/src/or/rendcommon.c
--- 2/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@@ -12,14 -12,10 +12,15 @@@
  
  #include "or.h"
  #include "circuitbuild.h"
+ #include "circuituse.h"
  #include "config.h"
  #include "control.h"
 +#include "crypto_rand.h"
 +#include "crypto_util.h"
 +#include "hs_client.h"
  #include "hs_common.h"
 +#include "hs_intropoint.h"
 +#include "networkstatus.h"
  #include "rendclient.h"
  #include "rendcommon.h"
  #include "rendmid.h"