tor 0.2.4.16-rc. remove obfsproxy from repo -- pip works well now.
Merge branch 'master' of github.com:mtigas/homebrew-tor

Conflicts:
	Formula/tor.rb
	README.md