[or-cvs] r15193: steal some of the bootstrap phase strings from vidalia (in tor/trunk: . src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2008-06-13 02:23:46 -0400 (Fri, 13 Jun 2008)
New Revision: 15193

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/control.c
Log:
steal some of the bootstrap phase strings from vidalia


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-06-13 05:55:00 UTC (rev 15192)
+++ tor/trunk/ChangeLog	2008-06-13 06:23:46 UTC (rev 15193)
@@ -21,7 +21,9 @@
   o Major bugfixes:
     - When we choose to abandon a new entry guard because we think our
       older ones might be better, close any circuits pending on that
-      new entry guard connection. Bugfix on 0.1.2.8-beta; found by lodger.
+      new entry guard connection. This fix should make us recover much
+      faster when our network is down and then comes back. Bugfix on
+      0.1.2.8-beta; found by lodger.
 
   o Memory fixes and improvements:
     - Add a malloc_good_size implementation to OpenBSD_malloc_linux.c,

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2008-06-13 05:55:00 UTC (rev 15192)
+++ tor/trunk/src/or/control.c	2008-06-13 06:23:46 UTC (rev 15193)
@@ -3710,7 +3710,7 @@
       break;
     case BOOTSTRAP_STATUS_CONN_DIR:
       *tag = "conn_dir";
-      *summary = "Connecting to directory mirror";
+      *summary = "Connecting to directory server";
       break;
     case BOOTSTRAP_STATUS_HANDSHAKE:
       *tag = "status_handshake";
@@ -3718,11 +3718,11 @@
       break;
     case BOOTSTRAP_STATUS_HANDSHAKE_DIR:
       *tag = "handshake_dir";
-      *summary = "Finishing handshake with directory mirror";
+      *summary = "Finishing handshake with directory server";
       break;
     case BOOTSTRAP_STATUS_ONEHOP_CREATE:
       *tag = "onehop_create";
-      *summary = "Establishing one-hop circuit for dir info";
+      *summary = "Establishing an encrypted directory connection";
       break;
     case BOOTSTRAP_STATUS_REQUESTING_STATUS:
       *tag = "requesting_status";
@@ -3746,15 +3746,15 @@
       break;
     case BOOTSTRAP_STATUS_CONN_OR:
       *tag = "conn_or";
-      *summary = "Connecting to entry guard";
+      *summary = "Connecting to the Tor network";
       break;
     case BOOTSTRAP_STATUS_HANDSHAKE_OR:
       *tag = "handshake_or";
-      *summary = "Finishing handshake with entry guard";
+      *summary = "Finishing handshake with first hop";
       break;
     case BOOTSTRAP_STATUS_CIRCUIT_CREATE:
       *tag = "circuit_create";
-      *summary = "Establishing circuits";
+      *summary = "Establishing a Tor circuit";
       break;
     case BOOTSTRAP_STATUS_DONE:
       *tag = "done";