diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:36:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:36:40 -0400 |
| commit | acd6a4856bccff92eb241b18066ca7df577ab5f2 (patch) | |
| tree | 153eb944a6f61e3591831b3fde0385ee4e51e5bd /src/or/dirvote.c | |
| parent | e36f9d1d9beec0daed57b68f936293dccc77b171 (diff) | |
| parent | 0b3166fffa0e5e19c63fd95538f87d634444d28c (diff) | |
| download | tor-acd6a4856bccff92eb241b18066ca7df577ab5f2.tar.gz tor-acd6a4856bccff92eb241b18066ca7df577ab5f2.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/connection.c
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index fa403e0006..fa0398c287 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -441,9 +441,9 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, if (cur && !compare_vote_rs(cur, rs)) { ++cur_n; } else { - if (cur_n > most_n || - (cur && cur_n == most_n && - cur->status.published_on > most_published)) { + if (cur && (cur_n > most_n || + (cur_n == most_n && + cur->status.published_on > most_published))) { most = cur; most_n = cur_n; most_published = cur->status.published_on; |