commit 67b4547a1edbdbbef283ac35709c40808619840f Merge: 5736529 f3fefed Author: Mike Perry <mikeperry-git@fscked.org> Date: Tue Sep 13 18:43:53 2011 -0700 Merge remote branch 'canderson/master' .gitignore | 3 + NetworkScanners/ExitAuthority/libsoat.py | 9 +- NetworkScanners/ExitAuthority/soat.py | 1308 ++++++++++---------------- NetworkScanners/ExitAuthority/soat_config.py | 34 +- 4 files changed, 515 insertions(+), 839 deletions(-)