diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-11-04 02:36:09 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-11-04 02:36:09 +0000 |
| commit | 735498cb27b7defbdce3ade21378417534395189 (patch) | |
| tree | 06c63ef027ab21d76ae71d8926f6c279e6d9b281 /src | |
| parent | 928c584ec219f4d2b5b60a22842390e4057e7dd0 (diff) | |
| download | tor-735498cb27b7defbdce3ade21378417534395189.tar.gz tor-735498cb27b7defbdce3ade21378417534395189.zip | |
add the other v3 dir bugfixes. my bridge is now working
again even when my datadir starts empty. phew.
svn:r12372
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/directory.c | 2 | ||||
| -rw-r--r-- | src/or/routerlist.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 778632922f..703cb55bca 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -670,6 +670,8 @@ directory_initiate_command(const char *address, uint32_t addr, dir_port)) { case -1: connection_dir_request_failed(conn); /* retry if we want */ + /* XXX we only pass 'conn' above, not 'resource', 'payload', + * etc. So in many situations it can't retry! -RD */ connection_free(TO_CONN(conn)); return; case 1: diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 93369e157e..4aedb64cca 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3911,7 +3911,8 @@ update_router_have_minimum_dir_info(void) if (should_delay_dir_fetches(get_options())) { log_notice(LD_DIR, "no known bridge descriptors running yet; stalling"); - strlcpy(dir_info_status, "No bridge descriptors.",sizeof(dir_info_status)); + strlcpy(dir_info_status, "No live bridge descriptors.", + sizeof(dir_info_status)); res = 0; goto done; } |