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

[mikeperry at torproject.org]

commit 8554340f34309af293ced771be9634887cef2568
Merge: 257fedb 42b5f0e
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Thu Jun 16 18:50:56 2011 -0700

    Merge branch 'bug2812'

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