Merge branch 'bug26924_029' into bug26924_032

diff --cc src/or/connection_or.c
index fd8c5fc7f299384fffda37fefc7caa1f52f301a1,a01d0862791a8464665785cc60dade8b039432b7..add0493d23c784fc42149a0b811868155acc6319
--- 1/src/or/connection_or.c
--- 2/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@@ -46,12 -45,11 +46,13 @@@
  #include "microdesc.h"
  #include "networkstatus.h"
  #include "nodelist.h"
 +#include "proto_cell.h"
  #include "reasons.h"
  #include "relay.h"
+ #include "rendcommon.h"
  #include "rephist.h"
  #include "router.h"
 +#include "routerkeys.h"
  #include "routerlist.h"
  #include "ext_orport.h"
  #include "scheduler.h"