Merge remote-tracking branch 'teor/bug24372'

This commit is contained in:
Nick Mathewson 2017-11-21 13:57:48 -05:00
commit 8b3580255d

View File

@ -519,7 +519,7 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method,
/* compare_vote_rs_() sorts the items by identity digest (all the same), /* compare_vote_rs_() sorts the items by identity digest (all the same),
* then by SD digest. That way, if we have a tie that the published_on * then by SD digest. That way, if we have a tie that the published_on
* date cannot tie, we use the descriptor with the smaller digest. * date cannot break, we use the descriptor with the smaller digest.
*/ */
smartlist_sort(votes, compare_vote_rs_); smartlist_sort(votes, compare_vote_rs_);
SMARTLIST_FOREACH_BEGIN(votes, vote_routerstatus_t *, rs) { SMARTLIST_FOREACH_BEGIN(votes, vote_routerstatus_t *, rs) {