Browse Source

Merge remote-tracking branch 'public/bug10722'

Nick Mathewson 10 years ago
parent
commit
3dfed0806c
2 changed files with 8 additions and 2 deletions
  1. 5 0
      changes/bug10722_msg
  2. 3 2
      src/or/rendclient.c

+ 5 - 0
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.

+ 3 - 2
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;
   }