Some changes...
Started working on changes to support testing through socks proxy.
Test
Removed SocksiPy root branch.
Added Janhouse/SocksiPy as submodule.
Merge branch 'master' into 29c3
Nothing.
Added -p -pp -ph options to measure through SOCKS 4 or 5 proxy.
Merge pull request #19 from Janhouse/29c3

Testing through SOCKS proxy support. Make sure you "git submodule update --init --recursive" after the update.