[or-cvs] r11896: Base vote timing only on a currently live consensus. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-12 13:43:09 -0400 (Fri, 12 Oct 2007)
New Revision: 11896

Modified:
   tor/trunk/
   tor/trunk/src/or/dirvote.c
Log:
 r15721 at catbus:  nickm | 2007-10-12 13:30:48 -0400
 Base vote timing only on a currently live consensus.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15721] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c	2007-10-12 17:13:09 UTC (rev 11895)
+++ tor/trunk/src/or/dirvote.c	2007-10-12 17:43:09 UTC (rev 11896)
@@ -1066,7 +1066,7 @@
   int interval, vote_delay, dist_delay;
   time_t start;
   time_t end;
-  networkstatus_vote_t *consensus = networkstatus_get_latest_consensus();
+  networkstatus_vote_t *consensus = networkstatus_get_live_consensus(now);
 
   memset(&voting_schedule, 0, sizeof(voting_schedule));