commit 8e94360d71e6e37c0dd19d7f43885cef2c265b99 Merge: 2fea9e2 ae161dd Author: Mike Perry mikeperry-git@fscked.org Date: Wed Nov 9 15:04:46 2011 -0800

Merge remote branch 'aagbsn/4264-bad-argument-to-ssltestresult'

NetworkScanners/ExitAuthority/soat.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)