From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Jan 2011 17:37:42 +0000 (-0500)
Subject: Explain bug2346 fix better based on suggestions from arma
X-Git-Tag: tor-0.2.2.21-alpha~7^2~11^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5044cb9752b4414cadcdc3b12926b005e390fdf0;p=thirdparty%2Ftor.git

Explain bug2346 fix better based on suggestions from arma
---

diff --git a/changes/bug2346 b/changes/bug2346
index 341b4f45bf..0f78b84614 100644
--- a/changes/bug2346
+++ b/changes/bug2346
@@ -1,5 +1,6 @@
   o Minor features
-    - If writing the state file to disk fails, wait an hour before
-      retrying again.  Fixes bug 2346.  Bugfix on Tor 0.1.1.3-alpha.
+    - If writing the state file to disk fails, wait up to an hour
+      before retrying again.  (Our old code would retry the write
+      immediately.)  Fixes bug 2346.  Bugfix on Tor 0.1.1.3-alpha.
 
 
diff --git a/src/or/config.c b/src/or/config.c
index 5198eaa055..a27fd22b24 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5187,7 +5187,8 @@ or_state_save(time_t now)
     global_state->LastWritten = -1;
     tor_free(fname);
     tor_free(contents);
-    /* Try again in after STATE_WRITE_RETRY_INTERVAL */
+    /* Try again after STATE_WRITE_RETRY_INTERVAL (or sooner, if the state
+     * changes sooner). */
     global_state->next_write = now + STATE_WRITE_RETRY_INTERVAL;
     return -1;
   }