[tor-commits] [pytorctl/master] Merge remote branch 'aagbsn/testing'

[mikeperry at torproject.org]

commit d0f593f2ae245e951323ff7fc3a65fa6a1f16b47
Merge: 3c438e0 eb736ba
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Fri Jun 24 11:57:47 2011 -0700

    Merge remote branch 'aagbsn/testing'

 SQLSupport.py  |  101 ++++++++++++++++++++++++++++++++++++++++++++------------
 ScanSupport.py |   18 +++++++++-
 2 files changed, 96 insertions(+), 23 deletions(-)