commit 021d8cc35bd072fb169fa41d90f5badfe4771522 Merge: 8e94360 d9c0f90 Author: Mike Perry <mikeperry-git@fscked.org> Date: Thu Nov 17 15:48:59 2011 -0800 Merge branch 'pid_control-rebased' NetworkScanners/BwAuthority/README.spec.txt | 214 ++++++- NetworkScanners/BwAuthority/aggregate.py | 671 +++++++++++++------- NetworkScanners/BwAuthority/bwauthority_child.py | 54 +- NetworkScanners/BwAuthority/cron.sh | 8 +- .../BwAuthority/data/scanner.1/bwauthority.cfg | 6 +- .../BwAuthority/data/scanner.2/bwauthority.cfg | 8 +- .../BwAuthority/data/scanner.3/bwauthority.cfg | 6 +- .../BwAuthority/data/scanner.4/bwauthority.cfg | 6 +- NetworkScanners/BwAuthority/data/tor/torrc | 7 +- NetworkScanners/BwAuthority/run_scan.sh | 2 +- TorCtl | 2 +- 11 files changed, 695 insertions(+), 289 deletions(-)