Minor fix in the warning messages when you're having problems

bootstrapping; also, be more forgiving of bootstrap problems when
we're still making incremental progress on a given bootstrap phase.


svn:r17066

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 1faae3906e..2a09444420 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@ Changes in version 0.2.1.7-alpha - 2008-10-xx
       identity fingerprints, so it's easier to paste them in.
       Suggested by Lucky Green.
 
+  o Minor bugfixes:
+    - Minor fix in the warning messages when you're having problems
+      bootstrapping; also, be more forgiving of bootstrap problems when
+      we're still making incremental progress on a given bootstrap phase.
+
 
 Changes in version 0.2.1.6-alpha - 2008-09-30
   Tor 0.2.1.6-alpha further improves performance and robustness of
diff --git a/src/or/control.c b/src/or/control.c
index c41ef37858..31468831a0 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3866,8 +3866,8 @@ control_event_bootstrap(bootstrap_status_t status, int progress)
     if (progress > bootstrap_percent) {
       /* incremental progress within a milestone */
       bootstrap_percent = progress;
+      bootstrap_problems = 0; /* Progress! Reset our problem counter. */
     }
-    bootstrap_problems = 0; /* Progress! Reset our problem counter. */
   }
 }
 
@@ -3901,6 +3901,7 @@ control_event_bootstrap_problem(const char *warn, int reason)
 
   while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0)
     status--; /* find a recognized status string based on current progress */
+  status = bootstrap_percent; /* set status back to the actual number */
 
   log_fn(!strcmp(recommendation, "warn") ? LOG_WARN : LOG_INFO,
          LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; "