| ... |
... |
@@ -74,28 +74,23 @@ pref("extensions.torlauncher.quickstart", false); |
|
74
|
74
|
|
|
75
|
75
|
pref("extensions.torlauncher.max_tor_log_entries", 1000);
|
|
76
|
76
|
|
|
77
|
|
-// By default, Tor Launcher configures a TCP listener for the Tor
|
|
78
|
|
-// control port, as defined by control_host and control_port.
|
|
79
|
|
-// Set control_port_use_ipc to true to use an IPC object (e.g., a Unix
|
|
80
|
|
-// domain socket) instead. You may also modify control_ipc_path to
|
|
81
|
|
-// override the default IPC object location. If a relative path is used,
|
|
82
|
|
-// it is handled like torrc_path (see below).
|
|
|
77
|
+// On Linux and macOS, Tor Browser can use IPC for the communication with the
|
|
|
78
|
+// tor daemon, and this is the preferred way.
|
|
|
79
|
+// You can set the path of the Unix sockets with control_ipc_path.
|
|
|
80
|
+// If a relative one is provided, it is handled like torrc_path (see below).
|
|
|
81
|
+// Tor Browser on Windows will use TCP (and it can be used also on Linux and
|
|
|
82
|
+// macOS, if preferred).
|
|
|
83
|
+// Host and port can be customized with control_host and control_port.
|
|
|
84
|
+// This applies both to the control port and to the SOCKS port, but their
|
|
|
85
|
+// configurations are completely independent.
|
|
|
86
|
+pref("extensions.torlauncher.control_port_use_ipc", true);
|
|
|
87
|
+pref("extensions.torlauncher.control_ipc_path", "");
|
|
83
|
88
|
pref("extensions.torlauncher.control_host", "127.0.0.1");
|
|
84
|
89
|
pref("extensions.torlauncher.control_port", 9151);
|
|
85
|
|
-pref("extensions.torlauncher.control_port_use_ipc", false);
|
|
86
|
|
-pref("extensions.torlauncher.control_ipc_path", "");
|
|
87
|
|
-
|
|
88
|
|
-// By default, Tor Launcher configures a TCP listener for the Tor
|
|
89
|
|
-// SOCKS port. The host is taken from the network.proxy.socks pref and
|
|
90
|
|
-// the port is taken from the network.proxy.socks_port pref.
|
|
91
|
|
-// Set socks_port_use_ipc to true to use an IPC object (e.g., a Unix
|
|
92
|
|
-// domain socket) instead. You may also modify socks_ipc_path to
|
|
93
|
|
-// override the default IPC object location. If a relative path is used,
|
|
94
|
|
-// it is handled like torrc_path (see below).
|
|
|
90
|
+pref("extensions.torlauncher.socks_port_use_ipc", true);
|
|
|
91
|
+pref("extensions.torlauncher.socks_ipc_path", "");
|
|
95
|
92
|
// Modify socks_port_flags to use a different set of SocksPort flags (but be
|
|
96
|
93
|
// careful).
|
|
97
|
|
-pref("extensions.torlauncher.socks_port_use_ipc", false);
|
|
98
|
|
-pref("extensions.torlauncher.socks_ipc_path", "");
|
|
99
|
94
|
pref("extensions.torlauncher.socks_port_flags", "ExtendedErrors IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth");
|
|
100
|
95
|
|
|
101
|
96
|
// The tor_path is relative to the application directory. On Linux and
|