Merge branch 'maint-0.3.3' into release-0.3.3
This commit is contained in:
commit
08cc2cc692
|
@ -0,0 +1,5 @@
|
||||||
|
o Minor bugfixes (controller, reliability):
|
||||||
|
- Avoid a (nonfatal) assertion failure when extending a one-hop circuit
|
||||||
|
from the controller to become a multihop circuit. Fixes bug 24903;
|
||||||
|
bugfix on 0.2.5.2-alpha.
|
||||||
|
|
|
@ -3530,6 +3530,9 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len,
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
circuit_append_new_exit(circ, 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);
|
extend_info_free(info);
|
||||||
first_node = 0;
|
first_node = 0;
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue