Merge branch 'bug24903_029' into maint-0.3.3

diff --cc src/or/control.c
index 6ac2dcb3dba513bcb3b0228442c8b08b7bf1d331,ff7f2e8b85cf83dff3e04723b3dcea90769922b4..fa62e9dbdebcb6ab650090adf420e8c24d999ce6
--- 1/src/or/control.c
--- 2/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;
    });