commit 25cb2bf77b1a98f2273b0f90c99b57e3d6e21a41 Merge: 962d30c e538547 Author: Mike Perry mikeperry-git@fscked.org Date: Mon Jun 27 11:23:39 2011 -0700

Merge branch 'ratio-restrictions'

PathSupport.py | 36 ++++++++++++++++++++++++++++++++---- TorCtl.py | 16 ++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-)