[tor-commits] [tor/master] Warning message when bug 10722 would trigger

[nickm at torproject.org]

commit b5d6e4700212ddbc336173e2f251c1d434a70189
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 16 12:11:07 2014 -0500

    Warning message when bug 10722 would trigger
    
    If somebody's excludenodes settings are keeping their hidden service
    connections from working, they should probably get notified about it.
---
 changes/bug10722_msg |    5 +++++
 src/or/rendclient.c  |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/bug10722_msg b/changes/bug10722_msg
new file mode 100644
index 0000000..fbfa37c
--- /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 634a98c..174511f 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -668,8 +668,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;
   }