[or-cvs] r11951: Do not set "have published consensus" to 1 after we recalcul (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-15 15:51:14 -0400 (Mon, 15 Oct 2007)
New Revision: 11951

Modified:
   tor/trunk/
   tor/trunk/src/or/dirvote.c
Log:
 r15793 at catbus:  nickm | 2007-10-15 15:50:52 -0400
 Do not set "have published consensus" to 1 after we recalculate timing.



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

Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c	2007-10-15 19:08:49 UTC (rev 11950)
+++ tor/trunk/src/or/dirvote.c	2007-10-15 19:51:14 UTC (rev 11951)
@@ -1137,10 +1137,10 @@
     log_notice(LD_DIR, "Time to publish the consensus and discard old votes");
     dirvote_publish_consensus();
     dirvote_clear_votes(0);
+    voting_schedule.have_published_consensus = 1;
     /* XXXX020 we will want to try again later if we haven't got enough
      * signatures yet. */
     dirvote_recalculate_timing(now);
-    voting_schedule.have_published_consensus = 1;
   }
 }