commit ca2d9cbb937e70e3f69e88e4e6a00fc0f818340c Merge: 33606405e 33a80921a Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 26 10:32:49 2018 -0400 Merge branch 'bug24903_029' into maint-0.3.3 changes/bug24903 | 5 +++++ src/or/control.c | 3 +++ 2 files changed, 8 insertions(+) diff --cc src/or/control.c index 6ac2dcb3d,ff7f2e8b8..fa62e9dbd --- a/src/or/control.c +++ b/src/or/control.c @@@ -3528,8 -3358,15 +3528,11 @@@ handle_control_extendcircuit(control_co circuit_mark_for_close(TO_CIRCUIT(circ), -END_CIRC_REASON_CONNECTFAILED); connection_write_str_to_buf("551 Couldn't start circuit\r\n", conn); goto done; - } else { - /* True, since node_has_descriptor(node) == true and we are extending - * to the node's primary address */ - tor_assert(info); } 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; });