diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-26 10:32:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-26 10:32:53 -0400 |
| commit | 08cc2cc692ac12c64dff992d68ffde55c7b95202 (patch) | |
| tree | ed76fe5aec81cf3c2c615289425ae0871c76da83 | |
| parent | 7ebb1ba2c3da9ced5f586a1fd4ddc397ff611f22 (diff) | |
| parent | ca2d9cbb937e70e3f69e88e4e6a00fc0f818340c (diff) | |
| download | tor-08cc2cc692ac12c64dff992d68ffde55c7b95202.tar.gz tor-08cc2cc692ac12c64dff992d68ffde55c7b95202.zip | |
Merge branch 'maint-0.3.3' into release-0.3.3
| -rw-r--r-- | changes/bug24903 | 5 | ||||
| -rw-r--r-- | src/or/control.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug24903 b/changes/bug24903 new file mode 100644 index 0000000000..01c9b53f23 --- /dev/null +++ b/changes/bug24903 @@ -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. + diff --git a/src/or/control.c b/src/or/control.c index 6ac2dcb3db..fa62e9dbde 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; }); |