Merge branch 'maint-0.3.1'

This commit is contained in:
Nick Mathewson 2017-06-21 13:54:07 -04:00
commit 5d3f484f4a
2 changed files with 6 additions and 1 deletions

5
changes/bug22356 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (logging, relay):
- Downgrade "assigned_to_cpuworker failed" message to INFO-level
severity. In every case that can reach it, either a better warning
has already been logged, or no warning is warranted. Fixes bug 22356;
bugfix on 0.2.6.3-alpha.

View File

@ -475,7 +475,7 @@ queue_pending_tasks(void)
return; return;
if (assign_onionskin_to_cpuworker(circ, onionskin)) if (assign_onionskin_to_cpuworker(circ, onionskin))
log_warn(LD_OR,"assign_to_cpuworker failed. Ignoring."); log_info(LD_OR,"assign_to_cpuworker failed. Ignoring.");
} }
} }