aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-07-15 18:56:59 +0000
committerRoger Dingledine <arma@torproject.org>2005-07-15 18:56:59 +0000
commit545c2c6c87fb10e95f5d7df1d7ca2d3f183d1fbb (patch)
tree50292bb30aeb22f4e97d09af023dc7dfd62f6abd /src
parent97174b67c2c8ad7a1df3d8904546e5851b046244 (diff)
downloadtor-545c2c6c87fb10e95f5d7df1d7ca2d3f183d1fbb.tar
tor-545c2c6c87fb10e95f5d7df1d7ca2d3f183d1fbb.tar.gz
the other half of the bugfix: tolerate a trusted dirserver claiming
dirport 0 in its descriptor. svn:r4576
Diffstat (limited to 'src')
-rw-r--r--src/or/routerlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 9a241ed8d..2f5397eac 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -247,8 +247,8 @@ mark_all_trusteddirservers_up(void)
{
if (routerlist) {
SMARTLIST_FOREACH(routerlist->routers, routerinfo_t *, router,
- if (router_digest_is_trusted_dir(router->identity_digest)) {
- tor_assert(router->dir_port > 0);
+ if (router_digest_is_trusted_dir(router->identity_digest) &&
+ router->dir_port > 0) {
router->is_running = 1;
router->status_set_at = time(NULL);
});