summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-21 13:54:02 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-21 13:54:02 -0400
commit784b29a2bfc7b7ce5ef355629528a38c50b81908 (patch)
tree8e0b2ab25b9a176ca1fd8684e80aa616ecf5033e
parente51e7bd38b758d3f71a2e31184dde3771f897af8 (diff)
parente3efc076c53467be4785301b3f1872bcb52630b1 (diff)
downloadtor-784b29a2bfc7b7ce5ef355629528a38c50b81908.tar.gz
tor-784b29a2bfc7b7ce5ef355629528a38c50b81908.zip
Merge branch 'bug22356_029' into maint-0.3.1
-rw-r--r--changes/bug223565
-rw-r--r--src/or/cpuworker.c2
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.");
}
}