[or-cvs] [tor/master] Bug #1222: Clarify new circuit after sleep notice

[nickm at torproject.org]

Author: Chris Ball <chris at printf.net>
Date: Sat, 31 Jul 2010 16:20:21 -0400
Subject: Bug #1222: Clarify new circuit after sleep notice
Commit: 1470eb2e91d6d9b986b6abb37fe9dc0d2f0b7ceb

("Application request when we're believed to be offline." ->
 "Application request when we haven't used client functionality lately.")
---
 changes/bug1222     |    5 +++++
 src/or/circuituse.c |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 changes/bug1222

diff --git a/changes/bug1222 b/changes/bug1222
new file mode 100644
index 0000000..66d24de
--- /dev/null
+++ b/changes/bug1222
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - #1222: Change "Application request when we're believed to be
+      offline." notice to "Application request when we haven't used
+      client functionality lately.", to clarify that it's not an error.
+
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index a3f10a8..63742da 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1184,13 +1184,13 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn,
        * as loudly. the user doesn't even know it's happening. */
       if (options->UseBridges && bridges_known_but_down()) {
         log_fn(severity, LD_APP|LD_DIR,
-               "Application request when we're believed to be "
-               "offline. Optimistically trying known bridges again.");
+               "Application request when we haven't used client functionality "
+               "lately. Optimistically trying known bridges again.");
         bridges_retry_all();
       } else if (!options->UseBridges || any_bridge_descriptors_known()) {
         log_fn(severity, LD_APP|LD_DIR,
-               "Application request when we're believed to be "
-               "offline. Optimistically trying directory fetches again.");
+               "Application request when we haven't used client functionality "
+               "lately. Optimistically trying directory fetches again.");
         routerlist_retry_directory_downloads(time(NULL));
       }
     }
-- 
1.7.1