tor

commit dc9ec519b51b8395a5d56b76f418f93c8734f97b
parent 005500e14d5a956601feb94712ea86e810d557f7
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 22 Jun 2017 08:04:12 -0400

Merge remote-tracking branch 'public/bug7890'

Diffstat:
A
changes/bug7890
 | 
4
++++
M
src/or/circuitbuild.c
 | 
5
+++--

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/bug7890 b/changes/bug7890
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging):
+    - Use a more comprehensible log message when telling the user they've
+      excluded every running exit node. Fixes bug 7890; bugfix on
+      0.2.2.25-alpha.
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
@@ -1956,9 +1956,10 @@ choose_good_exit_server_general(int need_uptime, int need_capacity)
   }
   if (options->ExitNodes) {
     log_warn(LD_CIRC,
-             "No specified %sexit routers seem to be running: "
+             "No exits in ExitNodes%s seem to be running: "
              "can't choose an exit.",
-             options->ExcludeExitNodesUnion_ ? "non-excluded " : "");
+             options->ExcludeExitNodesUnion_ ?
+             ", except possibly those excluded by your configuration, " : "");
   }
   return NULL;
 }