Merge branch 'bug26924_032' into bug26924

Update rendcommon.h include path.

diff --cc src/core/or/connection_or.c
index 159ee962666c4b2d9851c87668feb04530521ac2,fe2cea4f46c9c8252e15eb1ad564501c61758fe5..4fc77fde0cf3ecc4d027750db3b011f38db400d0
--- 1/src/core/or/connection_or.c
--- 2/src/or/connection_or.c
+++ b/src/core/or/connection_or.c
@@@ -28,50 -28,36 +28,51 @@@
   * part of a subclass (channel_tls_t).
   */
  #define TOR_CHANNEL_INTERNAL_
 -#include "channel.h"
 -#include "channeltls.h"
 -#include "circuitbuild.h"
 -#include "circuitlist.h"
 -#include "circuitstats.h"
 -#include "command.h"
 -#include "config.h"
 -#include "connection.h"
 -#include "connection_or.h"
 -#include "control.h"
 -#include "dirserv.h"
 -#include "entrynodes.h"
 -#include "geoip.h"
 -#include "main.h"
 -#include "link_handshake.h"
 -#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"
 -#include "torcert.h"
 -#include "channelpadding.h"
 +#define CONNECTION_OR_PRIVATE
 +#include "core/or/channel.h"
 +#include "core/or/channeltls.h"
 +#include "core/or/circuitbuild.h"
 +#include "core/or/circuitlist.h"
 +#include "core/or/circuitstats.h"
 +#include "core/or/command.h"
 +#include "app/config/config.h"
 +#include "core/mainloop/connection.h"
 +#include "core/or/connection_or.h"
 +#include "feature/control/control.h"
 +#include "lib/crypt_ops/crypto_rand.h"
 +#include "lib/crypt_ops/crypto_util.h"
 +#include "feature/dircache/dirserv.h"
 +#include "feature/client/entrynodes.h"
 +#include "feature/stats/geoip.h"
 +#include "core/mainloop/main.h"
 +#include "trunnel/link_handshake.h"
 +#include "feature/nodelist/microdesc.h"
 +#include "feature/nodelist/networkstatus.h"
 +#include "feature/nodelist/nodelist.h"
 +#include "core/proto/proto_cell.h"
 +#include "core/or/reasons.h"
 +#include "core/or/relay.h"
++#include "feature/rend/rendcommon.h"
 +#include "feature/stats/rephist.h"
 +#include "feature/relay/router.h"
 +#include "feature/relay/routerkeys.h"
 +#include "feature/nodelist/routerlist.h"
 +#include "feature/relay/ext_orport.h"
 +#include "core/or/scheduler.h"
 +#include "feature/nodelist/torcert.h"
 +#include "core/or/channelpadding.h"
 +
 +#include "core/or/cell_st.h"
 +#include "core/or/cell_queue_st.h"
 +#include "core/or/or_connection_st.h"
 +#include "core/or/or_handshake_certs_st.h"
 +#include "core/or/or_handshake_state_st.h"
 +#include "app/config/or_state_st.h"
 +#include "feature/nodelist/routerinfo_st.h"
 +#include "core/or/var_cell_st.h"
 +#include "lib/crypt_ops/crypto_format.h"
 +
 +#include "lib/tls/tortls.h"
  
  static int connection_tls_finish_handshake(or_connection_t *conn);
  static int connection_or_launch_v3_or_handshake(or_connection_t *conn);