summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/design.mdwn
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2017-04-29 10:46:51 +0200
committeranonym <anonym@riseup.net>2017-04-29 10:46:51 +0200
commit861622db82352c1b6681aa9d3e2453b86884d712 (patch)
tree09aa4d415f6e9d6ef105da80eb31ce6d6e5217d4 /wiki/src/contribute/design.mdwn
parent34144eae2f38fca38ed664e2437fb4b41de6a334 (diff)
parentfe917e7fd1bb18588f6428f79cecf16070736dd8 (diff)
Merge remote-tracking branch 'origin/devel' into feature/12173-end-whonix-controlport-filter-fork
Diffstat (limited to 'wiki/src/contribute/design.mdwn')
-rw-r--r--wiki/src/contribute/design.mdwn12
1 files changed, 7 insertions, 5 deletions
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 31b1e72..4e734fd 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