diff options
| author | teor <teor@torproject.org> | 2019-03-01 14:15:00 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-03-01 14:15:00 +1000 |
| commit | 7786198eef31b9c608c3e13ae143cd430319af50 (patch) | |
| tree | a609e1ba4489ca60933a2172f68d5d70af5ff99e | |
| parent | c1ab53847907166cdc93727cee5877c68e8bdd01 (diff) | |
| parent | 33a80921a2e7bbf128c27a1a0c4903a9a322708a (diff) | |
| download | tor-7786198eef31b9c608c3e13ae143cd430319af50.tar.gz tor-7786198eef31b9c608c3e13ae143cd430319af50.zip | |
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
| -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 03d9fcee2a..ff7f2e8b85 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3364,6 +3364,9 @@ handle_control_extendcircuit(control_connection_t *conn, uint32_t len, 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; }); |