diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:51:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-09-07 14:51:55 -0400 |
| commit | 41eef6680e814f453cc8eedff415e941429aa627 (patch) | |
| tree | 7d2ac796e36d7c5786289a6093a98c66c36dbaad /src/or/networkstatus.c | |
| parent | c6ea014b5978a020ca4472345216ba29584db5a9 (diff) | |
| parent | dfa6cde4d4de57476ea8381199dfbac1afc245d5 (diff) | |
| download | tor-41eef6680e814f453cc8eedff415e941429aa627.tar.gz tor-41eef6680e814f453cc8eedff415e941429aa627.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/dirserv.c
src/or/networkstatus.c
Conflicts were related to routerinfo->node shift.
Diffstat (limited to 'src/or/networkstatus.c')
| -rw-r--r-- | src/or/networkstatus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 398f041532..7cd9d02c3f 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2133,7 +2133,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); + set_routerstatus_from_routerinfo(&rs, node, ri, now, 0, 0, 0, 0); smartlist_add(statuses, networkstatus_getinfo_helper_single(&rs)); }); |