summaryrefslogtreecommitdiff
path: root/src/or/networkstatus.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-09-07 14:43:06 -0400
committerNick Mathewson <nickm@torproject.org>2011-09-07 14:43:06 -0400
commitdfa6cde4d4de57476ea8381199dfbac1afc245d5 (patch)
tree73b8f1ecac21bfad33f43c7759e5dfecf43361bc /src/or/networkstatus.c
parent5f9cdee8afd3fb0db835c19993fae476e0f00033 (diff)
parentf45261cb29504bfe39ddb96d8e7f38bb32dd37a5 (diff)
downloadtor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.tar.gz
tor-dfa6cde4d4de57476ea8381199dfbac1afc245d5.zip
Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2
Diffstat (limited to 'src/or/networkstatus.c')
-rw-r--r--src/or/networkstatus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 1aa4e4a239..b0ef74b02e 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -2105,7 +2105,7 @@ networkstatus_getinfo_by_purpose(const char *purpose_string, time_t now)
if (bridge_auth && ri->purpose == ROUTER_PURPOSE_BRIDGE)
dirserv_set_router_is_running(ri, now);
/* then generate and write out status lines for each of them */
- set_routerstatus_from_routerinfo(&rs, ri, now, 0, 0, 0);
+ set_routerstatus_from_routerinfo(&rs, ri, now, 0, 0, 0, 0);
smartlist_add(statuses, networkstatus_getinfo_helper_single(&rs));
});