Merge remote-tracking branch 'public/bug10722'

This commit is contained in:
Nick Mathewson 2014-02-16 12:13:12 -05:00
commit 3dfed0806c
2 changed files with 8 additions and 2 deletions

5
changes/bug10722_msg Normal file
View File

@ -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.

View File

@ -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;
}