diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-15 14:51:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-15 14:51:19 -0400 |
| commit | f3c20a28ab50386064043cc31edb3b1b543d6fc6 (patch) | |
| tree | 64773ca132f9582a9bb358057f66b2e01e2abb24 | |
| parent | 149931571a4c5ad9ec24eb6d4306e8965a454211 (diff) | |
| parent | b0e1ddbd98038e3c7326970887c74f169701cf35 (diff) | |
| download | tor-f3c20a28ab50386064043cc31edb3b1b543d6fc6.tar.gz tor-f3c20a28ab50386064043cc31edb3b1b543d6fc6.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/circuituse.c
| -rw-r--r-- | changes/bug11519 | 3 | ||||
| -rw-r--r-- | src/or/circuituse.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug11519 b/changes/bug11519 new file mode 100644 index 0000000000..5c1e6af7e4 --- /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 5984691989..c2d2b2e87c 100644 --- a/src/or/circuituse.c +++ b/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, |