nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

steal some of the bootstrap phase strings from vidalia

Browse Source 
svn:r15193
This commit is contained in:
Roger Dingledine 2008-06-13 06:23:46 +00:00
parent ff4b6bd15f
commit 52d3be06f1
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21,7 +21,9 @@ Changes in version 0.2.1.1-alpha - 2008-06-13
o Major bugfixes: o Major bugfixes:
- When we choose to abandon a new entry guard because we think our - When we choose to abandon a new entry guard because we think our
older ones might be better, close any circuits pending on that 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: o Memory fixes and improvements:
- Add a malloc_good_size implementation to OpenBSD_malloc_linux.c, - Add a malloc_good_size implementation to OpenBSD_malloc_linux.c,

12
src/or/control.c
View File

@ -3710,7 +3710,7 @@ bootstrap_status_to_string(bootstrap_status_t s, const char **tag,
break; break;
case BOOTSTRAP_STATUS_CONN_DIR: case BOOTSTRAP_STATUS_CONN_DIR:
*tag = "conn_dir"; *tag = "conn_dir";
*summary = "Connecting to directory mirror"; *summary = "Connecting to directory server";
break; break;
case BOOTSTRAP_STATUS_HANDSHAKE: case BOOTSTRAP_STATUS_HANDSHAKE:
*tag = "status_handshake"; *tag = "status_handshake";
@ -3718,11 +3718,11 @@ bootstrap_status_to_string(bootstrap_status_t s, const char **tag,
break; break;
case BOOTSTRAP_STATUS_HANDSHAKE_DIR: case BOOTSTRAP_STATUS_HANDSHAKE_DIR:
*tag = "handshake_dir"; *tag = "handshake_dir";
*summary = "Finishing handshake with directory mirror"; *summary = "Finishing handshake with directory server";
break; break;
case BOOTSTRAP_STATUS_ONEHOP_CREATE: case BOOTSTRAP_STATUS_ONEHOP_CREATE:
*tag = "onehop_create"; *tag = "onehop_create";
*summary = "Establishing one-hop circuit for dir info"; *summary = "Establishing an encrypted directory connection";
break; break;
case BOOTSTRAP_STATUS_REQUESTING_STATUS: case BOOTSTRAP_STATUS_REQUESTING_STATUS:
*tag = "requesting_status"; *tag = "requesting_status";
@ -3746,15 +3746,15 @@ bootstrap_status_to_string(bootstrap_status_t s, const char **tag,
break; break;
case BOOTSTRAP_STATUS_CONN_OR: case BOOTSTRAP_STATUS_CONN_OR:
*tag = "conn_or"; *tag = "conn_or";
*summary = "Connecting to entry guard"; *summary = "Connecting to the Tor network";
break; break;
case BOOTSTRAP_STATUS_HANDSHAKE_OR: case BOOTSTRAP_STATUS_HANDSHAKE_OR:
*tag = "handshake_or"; *tag = "handshake_or";
*summary = "Finishing handshake with entry guard"; *summary = "Finishing handshake with first hop";
break; break;
case BOOTSTRAP_STATUS_CIRCUIT_CREATE: case BOOTSTRAP_STATUS_CIRCUIT_CREATE:
*tag = "circuit_create"; *tag = "circuit_create";
*summary = "Establishing circuits"; *summary = "Establishing a Tor circuit";
break; break;
case BOOTSTRAP_STATUS_DONE: case BOOTSTRAP_STATUS_DONE:
*tag = "done"; *tag = "done";