[or-cvs] [torflow/master] We needed an extra wait_for_consensus check.

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Tue, 10 Aug 2010 03:04:22 -0700
Subject: We needed an extra wait_for_consensus check.
Commit: 05fd65d3f7ebae1b3a4dc660c431293ad6d65598

Also, update torctl.
---
 NetworkScanners/BwAuthority/bwauthority.py |    1 +
 TorCtl                                     |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/NetworkScanners/BwAuthority/bwauthority.py b/NetworkScanners/BwAuthority/bwauthority.py
index 492ebe8..8428440 100755
--- a/NetworkScanners/BwAuthority/bwauthority.py
+++ b/NetworkScanners/BwAuthority/bwauthority.py
@@ -288,6 +288,7 @@ def main(argv):
     plog('INFO', 'Beginning time loop')
     slice_num = 0 
     while pct < stop_pct:
+      hdlr.wait_for_consensus()
       pct_step = hdlr.rank_to_percent(nodes_per_slice)
       hdlr.reset_stats()
       hdlr.commit()
diff --git a/TorCtl b/TorCtl
index 3d5f402..cb91046 160000
--- a/TorCtl
+++ b/TorCtl
@@ -1 +1 @@
-Subproject commit 3d5f402e9f57e327e8c46b679baf53b8f8fca332
+Subproject commit cb91046748c407ddf477bb28adf14ab0b4a4242b
-- 
1.7.1