summaryrefslogtreecommitdiff
path: root/src/or/networkstatus.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-09 11:51:18 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-09 11:51:18 -0400
commit59f3cce0dcddb98301d18d0cb4cb08c1619fa34c (patch)
tree988f823cc734aaaaf08c8fb0b40f372b4c66f4ff /src/or/networkstatus.c
parent4af88d68b4905beac168adb5f1756d610ff7ed7e (diff)
parent607724c696a6e1bb10c8a955dac38f0ea947ce34 (diff)
downloadtor-59f3cce0dcddb98301d18d0cb4cb08c1619fa34c.tar.gz
tor-59f3cce0dcddb98301d18d0cb4cb08c1619fa34c.zip
Merge branch 'bug12899_squashed'
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 890da0ad17..026b988c34 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1655,7 +1655,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, node, ri, now, 0, 0, 0, 0);
+ set_routerstatus_from_routerinfo(&rs, node, ri, now, 0, 0, 0);
smartlist_add(statuses, networkstatus_getinfo_helper_single(&rs));
} SMARTLIST_FOREACH_END(ri);