tor 0.2.5.1-alpha
Merge branch 'master' of github.com:mtigas/homebrew-tor

Conflicts:
	Formula/tor.rb