diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-15 14:52:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-15 14:52:12 -0400 |
| commit | 9556668f5fe33faec2a2de049d10061150ac6608 (patch) | |
| tree | 8b3b75cc21971df5ad4009d4b4d357ebd3836758 /src | |
| parent | bc4c966851c16cfe3c92375fba22baf45a111a67 (diff) | |
| parent | f3c20a28ab50386064043cc31edb3b1b543d6fc6 (diff) | |
| download | tor-9556668f5fe33faec2a2de049d10061150ac6608.tar tor-9556668f5fe33faec2a2de049d10061150ac6608.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuituse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 8b82de0f9..75a10ba0c 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1515,7 +1515,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, |