Make Tor work with obfsproxy and obfs2

For this last sponsor G milestone, we'll have to finish the coding on Tor and obfsproxy that is required for users to do obfs2. This milestone doesn't include an alpha release or bundle, so merging things into master are sufficient.

This ticket is part of the June 30, 2012 milestone for sponsor G.