diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-09-28 18:37:55 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-09-28 18:37:55 -0400 |
| commit | 09a715bb72878ea08dc53bf8914807aa226d60aa (patch) | |
| tree | 849b7ef03c7fb6e5469da2802bfb4487bc77e8a2 /src | |
| parent | 6d8f2885d82b926b7894116384fe7fe48274e9f0 (diff) | |
| parent | 339993b409648bf3d767c6ba3133e1921de89dbd (diff) | |
| download | tor-09a715bb72878ea08dc53bf8914807aa226d60aa.tar.gz tor-09a715bb72878ea08dc53bf8914807aa226d60aa.zip | |
Merge branch 'maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitbuild.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 35d8087b6f..d696fe1b9b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4551,6 +4551,10 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) add_an_entry_guard(ri, 1); log_notice(LD_DIR, "new bridge descriptor '%s' (%s)", ri->nickname, from_cache ? "cached" : "fresh"); + /* set entry->made_contact so if it goes down we don't drop it from + * our entry node list */ + entry_guard_register_connect_status(ri->cache_info.identity_digest, + 1, 0, now); if (first) routerlist_retry_directory_downloads(now); } @@ -4616,7 +4620,8 @@ bridges_retry_helper(int act) } } }); - log_debug(LD_DIR, "any_known %d, any_running %d", any_known, any_running); + log_debug(LD_DIR, "%d: any_known %d, any_running %d", + act, any_known, any_running); return any_known && !any_running; } |