Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-10-11 04:38:43 -04:00
Code Issues Projects Releases Packages Wiki Activity

Connecting to Tor in bundled mode now creates a temporary tor data dir, starts a new tor process, and connects to it. Also, refactored Settings dialog to allow Linux to use bundled tor as well

Browse source
This commit is contained in:
Micah Lee 2017-04-13 22:22:34 -07:00
parent 3bbefd7267
commit e295f90e68
4 changed files with 91 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

3
share/locale/en.json
View file

@ -90,5 +90,6 @@
"error_tor_protocol_error": "Error talking to the Tor controller.\nIf you're using Whonix, check out https://www.whonix.org/wiki/onionshare to make OnionShare work.",
"gui_tor_window_title": "Tor Connection",
"gui_tor_button_close": "Close",
"gui_tor_button_restart": "Restart Tor"
"gui_tor_button_restart": "Restart Tor",
"connecting_to_tor": "Connecting to the Tor network"
}

9
share/torrc_template Normal file
View file

@ -0,0 +1,9 @@
DataDirectory {{data_directory}}
SocksPort {{socks_port}}
ControlSocket {{control_socket}}
CookieAuthentication 1
CookieAuthFile {{cookie_auth_file}}
AvoidDiskWrites 1
Log notice stdout
GeoIPFile {{geo_ip_file}}
GeoIPv6File {{geo_ipv6_file}}