diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-06-13 06:23:46 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-06-13 06:23:46 +0000 |
| commit | 52d3be06f148ab9e43927f90f96c23dc79306ea2 (patch) | |
| tree | e34318746647c9cf68d6a48fc99fb5e394286513 | |
| parent | ff4b6bd15f2e6071828c40a04917eb02fd33b33c (diff) | |
| download | tor-52d3be06f148ab9e43927f90f96c23dc79306ea2.tar.gz tor-52d3be06f148ab9e43927f90f96c23dc79306ea2.zip | |
steal some of the bootstrap phase strings from vidalia
svn:r15193
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/or/control.c | 12 |
2 files changed, 9 insertions, 7 deletions
@@ -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 79ae40233b..39fde9c74b 100644 --- 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"; |