aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug115193
-rw-r--r--src/or/circuituse.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug11519 b/changes/bug11519
new file mode 100644
index 000000000..5c1e6af7e
--- /dev/null
+++ b/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.
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index ade4224fe..7218ecc07 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1310,7 +1310,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_created;
+ struct timeval old_timestamp_created = circ->_base.timestamp_created;
log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)",
build_state_get_exit_nickname(circ->build_state), purpose,