Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed pygame dependency, allow using system tor and update over tor if the latter is used. #95

Merged
merged 3 commits into from
Jul 8, 2014

Conversation

tbbler
Copy link
Contributor

@tbbler tbbler commented Jun 26, 2014

This pull request contains several features:

  • I have removed the depency for pygame as this feature is none critical. Instead the option is grayed out and a tooltip appears inviting the user to install pygame if he desires the feature.
  • Added an option to use the system wide installation of tor. What this does is set the proper environment variables TOR_SKIP_LAUNCH, TOR_SOCKS_HOST, TOR_SOCKS_PORT.
  • When the previous feature is enabled (and the recommended python-txsocksx package is installed) allow the user to do updates (and checks) over Tor. This feature however is only available when using a system install of Tor (as the built-in Tor isn't launched when doing updates).
…f you do not have pygame installed, and it is no longer a dependecy or a suggested package.
…SKIP_LAUNCH/TOR_SOCKS_HOST/TOR_SOCKS_PORT); as well as downloading updates over tor when system tor is used
@tbbler
Copy link
Contributor Author

tbbler commented Jun 26, 2014

Note that the tor port defaults to 9050, ideally it would try to read the torrc file to determine is the port has been changed.

Right now setting the tor control port and password is unimplemented. If this were to be added (so that the Tor Button continues to work when using the system install and about:tor doesn't return a false negative) it should be implemented using something like gnome-keyring so that the password isn't stored in the settings file.

As mentioned, the download over tor feature right now requires the use of the system tor installation. For this to be fixed the launcher would need to launch the TBB's built-in tor first.

Nevertheless, I think this is an important feature for people who are using a system install of Tor, but would like the convenience of auto-update and .desktop launcher icons.

@micahflee
Copy link
Collaborator

Sorry about being so negligent! This is great work, I'm reviewing it now.

@micahflee
Copy link
Collaborator

And I love making pygame optional, and updating over Tor is something I wanted to build but never got around for it. So I'm excited about these features, thanks so much.

@micahflee micahflee merged commit a58f305 into torproject:master Jul 8, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants