nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson 2014-04-15 14:52:12 -04:00
commit 9556668f5f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug11519 Normal file
View File

@ -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.

2
src/or/circuituse.c
View File

@ -1515,7 +1515,7 @@ circuit_launch_by_extend_info(uint8_t purpose,
circ = circuit_find_to_cannibalize(purpose, extend_info, flags); circ = circuit_find_to_cannibalize(purpose, extend_info, flags);
if (circ) { if (circ) {
uint8_t old_purpose = circ->base_.purpose; 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)", log_info(LD_CIRC,"Cannibalizing circ '%s' for purpose %d (%s)",
build_state_get_exit_nickname(circ->build_state), purpose, build_state_get_exit_nickname(circ->build_state), purpose,