tor

commit ca2d9cbb937e70e3f69e88e4e6a00fc0f818340c
parent 33606405e3070de6517690b1494f16c04524ce72
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 26 Mar 2018 10:32:49 -0400

Merge branch 'bug24903_029' into 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;
   });