[tor-commits] [pytorctl/master] Merge remote branch 'atagar/bug2812'

[mikeperry at torproject.org]

commit cb62cf7c70982b83c2d480e55843e098d42ed697
Merge: 8554340 3c6a326
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Fri Jun 17 16:10:45 2011 -0700

    Merge remote branch 'atagar/bug2812'

 TorCtl.py  |  130 ++++++++++++++++++++++++++++++++++++++++++------------------
 TorUtil.py |    9 +++-
 2 files changed, 98 insertions(+), 41 deletions(-)