diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-21 13:54:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-21 13:54:07 -0400 |
| commit | 5d3f484f4ac4f45c0404b1f8b998983636f2a693 (patch) | |
| tree | 77957f562c495c685b3a9bd249dc4523c746d0ce | |
| parent | 72b132e2a4e0f2ae5865b5a40e62ee139512adba (diff) | |
| parent | 784b29a2bfc7b7ce5ef355629528a38c50b81908 (diff) | |
| download | tor-5d3f484f4ac4f45c0404b1f8b998983636f2a693.tar.gz tor-5d3f484f4ac4f45c0404b1f8b998983636f2a693.zip | |
Merge branch 'maint-0.3.1'
| -rw-r--r-- | changes/bug22356 | 5 | ||||
| -rw-r--r-- | src/or/cpuworker.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug22356 b/changes/bug22356 new file mode 100644 index 0000000000..0082b542be --- /dev/null +++ b/changes/bug22356 @@ -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. diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index af79fafaa6..1013fa555e 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -475,7 +475,7 @@ queue_pending_tasks(void) return; 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."); } } |