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

[mikeperry at torproject.org]

commit 1104d88407c1735b476ec67bc680f7a7cde9069d
Merge: 96133c8 343931a
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Fri Feb 25 17:59:52 2011 -0800

    Merge remote branch 'chiiph/master'

 TorUtil.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)