[tor-commits] [torflow/master] Merge remote-tracking branch 'origin/master'

[mikeperry at torproject.org]

commit 840072d7d5885bafbe3c463f5ba686ae32114457
Merge: 2d580e2 3c0dd74
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Wed Apr 18 17:13:01 2012 -0700

    Merge remote-tracking branch 'origin/master'

 NetworkScanners/BwAuthority/README.spec.txt |    6 ++
 NetworkScanners/BwAuthority/aggregate.py    |   77 ++++++++++++++++++++-------
 2 files changed, 64 insertions(+), 19 deletions(-)