added python-socksipy to tails build
Merge branch 'master' of github.com:micahflee/onionshare
fix bug caused by refactoring that made Tails launch infinite onionshare processes (oops)
fixed Tails bug where if you stopped server in GUI, you could not start a new server again