diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-15 14:48:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-15 14:48:00 -0400 |
| commit | b0e1ddbd98038e3c7326970887c74f169701cf35 (patch) | |
| tree | 6e0a831de91af8ac6df861d3cdbc20760326db6e | |
| parent | 75b4975d7722d9497847fdab8dcfb2ac10f58fdb (diff) | |
| parent | b2106956e0adc0382f033e1a6cd0896a24122d05 (diff) | |
| download | tor-b0e1ddbd98038e3c7326970887c74f169701cf35.tar.gz tor-b0e1ddbd98038e3c7326970887c74f169701cf35.zip | |
Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3
| -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 ade4224fe5..7218ecc077 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, |