[tor-commits] [torflow/master] Merge branch 'ratio-restrictions'

[mikeperry at torproject.org]

commit 039d5300c6d1bb9adfa7a21af0560620d620978f
Merge: 07cbb7c a3fdd01
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Mon Jun 27 11:22:47 2011 -0700

    Merge branch 'ratio-restrictions'

 NetworkScanners/BwAuthority/bwauthority_child.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)