torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug11519_023' into maint-0.2.3

Browse Source
This commit is contained in:
Nick Mathewson
2014-04-15 14:48:00 -04:00
parent 75b4975d77 b2106956e0
commit b0e1ddbd98
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug11519
+3
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.
src/or/circuituse.c
+1 -1
View File
@@ -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,