summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-11-23 14:10:46 -0800
committerNick Mathewson <nickm@torproject.org>2011-11-30 14:54:15 -0500
commit328c9582a90f65c5f21d05f2de889bc2286dc0ff (patch)
tree4f6ab5c3f5e043c30a4dd6c54d38dd54108d8d26 /src
parenta364f88477105075a202e55b2e44dafa4bf2be51 (diff)
downloadtor-328c9582a90f65c5f21d05f2de889bc2286dc0ff.tar.gz
tor-328c9582a90f65c5f21d05f2de889bc2286dc0ff.zip
Add ifdefs to disable assertion in connection_ap_handshake_send_begin
Diffstat (limited to 'src')
-rw-r--r--src/or/connection_edge.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index bba666d3b9..dc15721b6c 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2461,7 +2461,9 @@ connection_ap_handshake_send_begin(entry_connection_t *ap_conn)
begin_type = ap_conn->use_begindir ?
RELAY_COMMAND_BEGIN_DIR : RELAY_COMMAND_BEGIN;
if (begin_type == RELAY_COMMAND_BEGIN) {
+#ifndef NON_ANONYMOUS_MODE_ENABLED
tor_assert(circ->build_state->onehop_tunnel == 0);
+#endif
}
if (connection_edge_send_command(edge_conn, begin_type,