[tor-commits] [torflow/master] Merge branch 'fixes_rebased_2018_4066_4067_4077'

[mikeperry at torproject.org]

commit c1871065ca2b110b74f96dfbc2dd6367815a1d8e
Merge: 8e56ac3 599a74b
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Fri Sep 30 17:18:12 2011 -0700

    Merge branch 'fixes_rebased_2018_4066_4067_4077'

 NetworkScanners/BwAuthority/README.BwAuthorities   |   38 ++++++++++++++++---
 .../BwAuthority/data/scanner.2/bwauthority.cfg     |    4 +-
 .../BwAuthority/data/scanner.3/bwauthority.cfg     |    4 +-
 .../BwAuthority/data/scanner.4/bwauthority.cfg     |    4 +-
 NetworkScanners/ExitAuthority/libsoat.py           |    8 ++++-
 NetworkScanners/ExitAuthority/snakeinspector.py    |    8 ++++-
 NetworkScanners/ExitAuthority/soat.py              |   10 ++++-
 NetworkScanners/ExitAuthority/soat_config.py       |    8 ++++-
 NetworkScanners/ExitAuthority/soatstats.py         |   10 ++++-
 9 files changed, 75 insertions(+), 19 deletions(-)