summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-02-16 12:13:12 -0500
committerNick Mathewson <nickm@torproject.org>2014-02-16 12:13:12 -0500
commit3dfed0806c833e7bc34796a412925c502474bebf (patch)
treee5e65289f3f042c11f6ad9a5d05269859afd6bf0
parent35423d397f9d4f7810e538b608ded47c33311026 (diff)
parentb5d6e4700212ddbc336173e2f251c1d434a70189 (diff)
downloadtor-3dfed0806c833e7bc34796a412925c502474bebf.tar.gz
tor-3dfed0806c833e7bc34796a412925c502474bebf.zip
Merge remote-tracking branch 'public/bug10722'
-rw-r--r--changes/bug10722_msg5
-rw-r--r--src/or/rendclient.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/changes/bug10722_msg b/changes/bug10722_msg
new file mode 100644
index 0000000000..fbfa37c264
--- /dev/null
+++ b/changes/bug10722_msg
@@ -0,0 +1,5 @@
+ o Minor bugfixes:
+ - Log an improved message when excluding hidden service directory
+ nodes prevents a hidden service from working.
+ Improves on our fix for bug #10722, which was a bugfix on
+ 0.2.0.10-alpha. \ No newline at end of file
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 24d720c91e..d42024010d 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -670,8 +670,9 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query)
"service directories, because we requested them all "
"recently without success.");
if (options->StrictNodes && excluded_some) {
- log_info(LD_REND, "There are others that we could have tried, but "
- "they are all excluded, and StrictNodes is set.");
+ log_warn(LD_REND, "Could not pick a hidden service directory for the "
+ "requested hidden service: they are all either down or "
+ "excluded, and StrictNodes is set.");
}
return 0;
}