steal some of the bootstrap phase strings from vidalia

svn:r15193

diff --git a/ChangeLog b/ChangeLog
index f40cdb1052f9a1dec7099c2acbfea29e07348f9f..021d8b80dc4fdfff74b86bcd392626fcfe5844f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,7 +21,9 @@ Changes in version 0.2.1.1-alpha - 2008-06-13
   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,

diff --git a/src/or/control.c b/src/or/control.c
index 79ae40233b2aca9d9ad0447eeb8d8f226d774e50..39fde9c74b5836e6790dc92591f3d8458af60c0d 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3710,7 +3710,7 @@ bootstrap_status_to_string(bootstrap_status_t s, const char **tag,
       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 @@ bootstrap_status_to_string(bootstrap_status_t s, const char **tag,
       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 @@ bootstrap_status_to_string(bootstrap_status_t s, const char **tag,
       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";