Unverified Commit 7786198e authored by teor's avatar teor
Browse files

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

parents c1ab5384 33a80921

changes/bug24903

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/or/control.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

  });