summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-03-26 10:32:53 -0400
committerNick Mathewson <nickm@torproject.org>2018-03-26 10:32:53 -0400
commit5278d72f97683c8c89117d5b7111eb5f84baa569 (patch)
treeaed3f9dad3c2783a50762eb66e8c606dfd992472 /src/or
parentc68bfc556c7820ca3f3e01aa1ba0f8487b172fcd (diff)
parentca2d9cbb937e70e3f69e88e4e6a00fc0f818340c (diff)
downloadtor-5278d72f97683c8c89117d5b7111eb5f84baa569.tar.gz
tor-5278d72f97683c8c89117d5b7111eb5f84baa569.zip
Merge branch 'maint-0.3.3'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/control.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 7786e16481..e2b6280790 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3530,6 +3530,9 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len,
goto done;
}
circuit_append_new_exit(circ, info);
+ if (circ->build_state->desired_path_len > 1) {
+ circ->build_state->onehop_tunnel = 0;
+ }
extend_info_free(info);
first_node = 0;
});