summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/design.mdwn
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2017-06-07 16:32:30 +0000
committersajolida <sajolida@pimienta.org>2017-06-07 16:32:30 +0000
commit8d4471a7d64039d501967570875ee8c9367a05bf (patch)
treed76402a8994815ea0f9f4e6f509074f0a8f76f30 /wiki/src/contribute/design.mdwn
parent433172e438330c3deb752f6b3c2e0d69ad4c656f (diff)
parent90d68ee3e44c731eadfc446159b5ed834505b5fa (diff)
Merge remote-tracking branch 'origin/master' into web/11709-close-tails-support
Diffstat (limited to 'wiki/src/contribute/design.mdwn')
-rw-r--r--wiki/src/contribute/design.mdwn14
1 files changed, 8 insertions, 6 deletions
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 8b64b92..91bcc71 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -988,8 +988,9 @@ As for extensions we have the following differences:
most ads.
* Tails does not install the Tor Launcher extension as part of the
- browser. A patched Tor Launcher is installed for use as a
- stand-alone XUL application, though.
+ browser. Instead we extract Tor Launcher from the bundled .xpi and
+ make it available as a stand-alone XUL application for Tor
+ bridge/proxy configuration.
In Tails we do not use the `start-tor-browser` script, since it does a
lot of stuff not needed in Tails (error checking mainly) and isn't
@@ -1004,6 +1005,7 @@ ready, they are informed it won't work, and asked whether to start the
browser anyway:
- [[!tails_gitweb config/chroot_local-includes/usr/local/bin/tor-browser]]
+- [[!tails_gitweb config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh]]
- [[!tails_gitweb config/chroot_local-includes/usr/local/lib/generate-tor-browser-profile]]
- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/tails-tor-has-bootstrapped.target]]
- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/tails-wait-until-tor-has-bootstrapped.service]]
@@ -1025,9 +1027,9 @@ The remaining configuration differences can be found in:
- [[!tails_gitweb config/chroot_local-hooks/15-symlink-places.sqlite]]
It should also be noted that the global TBB installation is also used
-for the [[Unsafe Browser]] and [[I2P Browser]], although they are
-user-isolated and use separate profiles with very different
-configurations.
+for the [[Unsafe Browser]], although it is
+user-isolated and use a separate profile with very different
+configuration.
### 3.6.14 Icedove
@@ -1140,7 +1142,7 @@ Tails puts the wireless devices in a sensible state at boot time.
At boot time, Tails unblocks Wi-Fi, WWAN and WiMAX radios, unblocks
Bluetooth radio (so that it can be dealt another way:
-[[todo/protect_against_external_bus_memory_forensics]]), and
+[[!tails_ticket 5451 desc="protect against external bus memory forensics"]]), and
soft-blocks all other kinds of wireless devices (e.g. UWB, GPS, FM).
- [[!tails_gitweb config/chroot_local-includes/lib/systemd/system/tails-set-wireless-devices-state.service]]