micahflee/onionshare — pull request #120 by r4v5 (2014-08-31 20:12:21+00:00)
Title: Fix the travis build

So socksipy is old and hasn't been touched in a long time. Pysocks is an apparently-modern, maintained fork. I don't know why socksipy was failing to import in #118 but pysocks can be pip install'd.

Whatever was affecting the travis builders was also affecting me on OSX, fwiw, which is how I found pysocks.

Does this current build work and pass tests when built on tails? I see references to socksipy in tails/build.sh but don't want to change it if it actually works there.

Also, fixed a test that was actually failing.