tor

commit 5278d72f97683c8c89117d5b7111eb5f84baa569
parent c68bfc556c7820ca3f3e01aa1ba0f8487b172fcd
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 26 Mar 2018 10:32:53 -0400

Merge branch 'maint-0.3.3'

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
@@ -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;
   });