tor

commit 7786198eef31b9c608c3e13ae143cd430319af50
parent c1ab53847907166cdc93727cee5877c68e8bdd01
Author: teor <teor@torproject.org>
Date:   Fri,  1 Mar 2019 14:15:00 +1000

Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9

Diffstat:
A
changes/bug24903
 | 
5
+++++
M
src/or/control.c
 | 
3
+++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/bug24903 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
@@ -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;
   });