Explain bug2346 fix better based on suggestions from arma

diff --git a/changes/bug2346 b/changes/bug2346
index 341b4f45bfcfeee1f5d68631a639294443f2b983..0f78b84614f1b3a5b2f960d97ae546b1e5cbc98d 100644 (file)
--- 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 5198eaa0552c92c47caed7dcce513cfb5fab3d3f..a27fd22b24248675e455afd66cbbab939371b4bb 100644 (file)
--- 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;
   }