diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-06-30 10:13:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-06-30 10:13:51 -0400 |
| commit | 9f28cfe86af085e94b9b929041851dc8386231b2 (patch) | |
| tree | d6eeb9feb098a1653e428bf39bac6340037bebd4 /src/or/dirserv.c | |
| parent | f466f3d12c7480fcff8b3366991f7a44816d2e41 (diff) | |
| parent | 1ace3799facd9cae6f16f64647fec2281333539f (diff) | |
| download | tor-9f28cfe86af085e94b9b929041851dc8386231b2.tar.gz tor-9f28cfe86af085e94b9b929041851dc8386231b2.zip | |
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 76ac3978f8..f355fdf03e 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -797,7 +797,7 @@ directory_remove_invalid(void) if (r & FP_REJECT) { log_info(LD_DIRSERV, "Router '%s' is now rejected: %s", ent->nickname, msg?msg:""); - routerlist_remove(rl, ent, 0); + routerlist_remove(rl, ent, 0, time(NULL)); i--; changed = 1; continue; @@ -951,8 +951,8 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now) answer = get_options()->AssumeReachable || now < router->last_reachable + REACHABLE_TIMEOUT; - if (router->is_running && !answer) { - /* it was running but now it's not. tell rephist. */ + if (!answer) { + /* not considered reachable. tell rephist. */ rep_hist_note_router_unreachable(router->cache_info.identity_digest, now); } |