Преглед изворни кода

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
	src/or/circuituse.c
Nick Mathewson пре 10 година
родитељ
комит
f3c20a28ab
2 измењених фајлова са 4 додато и 1 уклоњено
  1. 3 0
      changes/bug11519
  2. 1 1
      src/or/circuituse.c

+ 3 - 0
changes/bug11519

@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Avoid sending an garbage value to the controller when a circuit is
+      cannibalized. Fixes bug 11519; bugfix on 0.2.3.11-alpha.

+ 1 - 1
src/or/circuituse.c

@@ -1518,7 +1518,7 @@ circuit_launch_by_extend_info(uint8_t purpose,
     circ = circuit_find_to_cannibalize(purpose, extend_info, flags);
     if (circ) {
       uint8_t old_purpose = circ->base_.purpose;
-      struct timeval old_timestamp_began;
+      struct timeval old_timestamp_began = circ->base_.timestamp_began;
 
       log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)",
                build_state_get_exit_nickname(circ->build_state), purpose,