[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [user-manual/master] Include updated manual text
commit 83a99998a98165df00d03d8a325a2d614c7ce1e4
Author: Harmony <harmony@xxxxxxxxxxxxxx>
Date: Tue Apr 7 13:45:57 2015 +0000
Include updated manual text
---
C/about-tor-browser.page | 68 +++++++++++++
C/bridges.page | 163 +++++++++----------------------
C/circumvention.page | 69 +++++++++-----
C/first-time.page | 68 +++++++++++++
C/known-issues.page | 8 +-
C/managing-identities.page | 129 +++++++++++++++++++++++++
C/onionsites.page | 67 +++++++++++++
C/plugins.page | 70 ++++++++++++++
C/secure-connections.page | 118 +++++++++++++++++++++++
C/security-slider.page | 76 +++++++++++++++
C/tor.page | 228 --------------------------------------------
C/transports.page | 112 ++++++++++++++++++++++
C/troubleshooting.page | 101 ++++++++++++++++----
C/uninstalling.page | 18 ++--
C/updating.page | 73 ++++++++++++++
15 files changed, 966 insertions(+), 402 deletions(-)
diff --git a/C/about-tor-browser.page b/C/about-tor-browser.page
new file mode 100644
index 0000000..654eebe
--- /dev/null
+++ b/C/about-tor-browser.page
@@ -0,0 +1,68 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="topic"
+ id="about-tor-browser">
+
+ <info>
+ <link type="guide" xref="index" group="#first"/>
+ <desc>Learn what Tor Browser can do to protect your privacy and anonymity.</desc>
+ </info>
+
+ <title>About Tor Browser</title>
+
+ <p>
+ Tor Browser uses the Tor network to protect your privacy and
+ anonymity. Using the Tor network has two main properties:
+ </p>
+ <list>
+ <item>
+ <p>
+ Your internet activity, including the names and addresses of
+ the websites you visit, will be hidden from your Internet
+ service provider and from anyone watching your connection
+ locally.
+ </p>
+ </item>
+ <item>
+ <p>
+ The operators of the websites and services that you use, and
+ anyone watching them, will see a connection coming from the
+ Tor network instead of your real Internet (IP) address, and
+ will not know who you are unless you explicitly identify
+ yourself.
+ </p>
+ </item>
+ </list>
+ <p>
+ In addition, Tor Browser is designed to prevent websites from
+ â??fingerprintingâ?? or identifying you based on your browser
+ configuration.
+ </p>
+ <p>
+ By default, Tor Browser does not keep any browsing history.
+ Cookies are only valid for a single session (until Tor Browser
+ is exited or a <link xref='managing-identities#new-identity'>New
+ Identity</link> is requested).
+ </p>
+
+ <!-- XXX: ask Tor Browser team/mikeperry about things that are worth
+ adding here. -->
+
+ <section id="how-tor-works">
+ <title>How Tor works</title>
+
+ <p>
+ Tor is a network of virtual tunnels that allows you to improve your
+ privacy and security on the Internet. Tor works by sending your
+ traffic through three random servers (also known as <em>relays</em>)
+ in the Tor network. The last relay in the circuit (the â??exit relayâ??)
+ then sends the traffic out onto the public Internet.
+ </p>
+ <media type="image" src="media/how-tor-works.png" />
+ <p>
+ The image above illustrates a user browsing to different websites
+ over Tor. The green monitors represent relays in the Tor network,
+ while the three keys represent the layers of encryption between the
+ user and each relay.
+ </p>
+ </section>
+</page>
diff --git a/C/bridges.page b/C/bridges.page
index 6c4cc57..96aeb16 100644
--- a/C/bridges.page
+++ b/C/bridges.page
@@ -1,151 +1,78 @@
-
<page xmlns="http://projectmallard.org/1.0/";
type="topic"
id="bridges">
<info>
- <desc>What bridges are and how to use them.</desc>
- <link type="guide" xref="index" />
+ <desc>Learn what bridges are and how to get them</desc>
+ <link type="topic" xref="circumvention" />
</info>
<title>Bridges</title>
<p>
-Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run
-by volunteers. Unlike relays, they are not listed publicly. Using bridges
-disguise the fact that one is using Tor.
+ Most <link xref='transports'>Pluggable Transports</link>, such as obfs3
+ and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges
+ are run by volunteers; unlike ordinary relays, however, they are not listed
+ publicly, so an adversary cannot identify them easily. Using bridges in
+ combination with pluggable transports helps to disguise the fact that you
+ are using Tor.
</p>
<p>
-Currently there are five bridge types, or transports, available. More are
-being developed.
+Other pluggable transports, like meek and Flashproxy, use different
+anti-censorship techniques that do not rely on bridges. You do not need
+to obtain bridge addresses in order to use these transports.
</p>
-<table frame='all' rules='all'>
- <tr>
- <td>
- <p>
- ORPort
- </p>
- </td>
- <td>
- <p>
- Requesting 'bridges' without specifying the bridge type, will return
- ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT
- reliable for circumventing censorship or national firewalls. ORPort
- bridges can be useful as trusted entry points into the Tor network.
- </p>
- </td>
- </tr>
- <tr>
- <td>
- <p>
- obfs2
- </p>
- </td>
- <td>
- <p>
- Censors have learned how to identify obfs2 bridges. This transport
- is being deprecated.
- </p>
- </td>
- </tr>
- <tr>
- <td>
- <p>
- obfs3
- </p>
- </td>
- <td>
- <p>
- Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work
- almost everywhere. A few obfs3 bridges have been blocked.
- </p>
- </td>
- </tr>
- <tr>
- <td>
- <p>
- Scramblesuit
- </p>
- </td>
- <td>
- <p>
- Scramblesuit is an additional tool for the obfsproxy transport.
- Scramblesuit bridges are designed to be hard to identify and hard to
- block.
- </p>
- </td>
- </tr>
- <tr>
- <td>
- <p>
- FTE
- </p>
- </td>
- <td>
- <p>
- Format-Transforming Encryption disguises Tor traffic as web (HTTP)
- traffic or other types of internet traffic. FTE bridges are
- effective, but in limited supply.
- </p>
- </td>
- </tr>
-</table>
-<p>
-(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)
-</p>
+<section id="getting-bridges">
+ <title>Getting bridge addresses</title>
+ <p>
+ Because bridge addresses are not public, you will need to request them
+ yourself. You have three options:
+ </p>
-<p>
-There are four ways to get a bridge.
-</p>
-
-<steps>
- <item>
- <p>
- Visit <link href='https://bridges.torproject.org/'>https://bridges.torproject.org/</link> and follow the instructions.
- </p>
- </item>
+<list>
<item>
<p>
- Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo
- email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges
- or <cmd>transport=obfs3</cmd> for obfs3 bridges.
+ Visit <link href='https://bridges.torproject.org/'>https://bridges.torproject.org/</link>
+ and follow the instructions, or
</p>
</item>
<item>
<p>
- Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access
- either of the first two methods.
+ Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email
+ address, or
</p>
</item>
<item>
<p>
- Install and configure a Tor instance to be bridge
- for yourself. The computer acting as a bridge must have uncensored internet
- access to the Tor network. A full installation guide can be found at
- <link href='https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en'>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>
+ Politely ask a human at help@xxxxxxxxxxxxxxxxx if neither of the first
+ two methods works for you.
</p>
</item>
-</steps>
+</list>
+</section>
-<p>
-Enter the bridge information you get from any of the above steps in
-Tor-launcher.
-</p>
+<section id="entering-bridges">
+ <title>Entering bridge addresses</title>
+ <p>
+ Once you have obtained some bridge addresses, you will need to enter them
+ into Tor Launcher.
+ </p>
-<p>
-Choose yes when asked if your Internet Service Provider blocks connections to
-the Tor network. Select 'Use custom bridges' and enter each bridge identifier
-on its own line.
-</p>
+ <p>
+ Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to
+ the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address
+ on a separate line.
+ </p>
-<media type="image" src="media/tor-launcher-custom-bridges_en-US.png" />
-
-<p>
-Click Connect. Using bridges slow down the connection. If the connection fails,
-the bridges you received may be down. Get more and try again.
-</p>
+ <media type="image" src="media/tor-launcher-custom-bridges_en-US.png" />
+ <p>
+ Click â??Connectâ??. Using bridges may slow down the connection compared to
+ using ordinary Tor relays. If the connection fails, the bridges you
+ received may be down. Please use one of the above methods to obtain
+ more bridge addresses, and try again.
+ </p>
+</section>
</page>
-
diff --git a/C/circumvention.page b/C/circumvention.page
index 5fc1f03..de0ba04 100644
--- a/C/circumvention.page
+++ b/C/circumvention.page
@@ -1,4 +1,3 @@
-
<page xmlns="http://projectmallard.org/1.0/";
type="topic"
id="circumvention">
@@ -11,35 +10,61 @@
<title>Circumvention</title>
<p>
-Some firewalls can detect and block connections to Tor. The Tor Browser
-includes some circumvention tools for getting around blocking firewalls.
-These circumvention tools are called Pluggable Transports. To turn them on,
-click "Configure" in the Tor launcher window.
+Direct access to the Tor network may sometimes be blocked by your Internet
+Service Provider or by a government. Tor Browser includes some
+circumvention tools for getting around these blocks. These tools are called
+â??pluggable transportsâ??. See the <link xref='transports'>Pluggable
+Transports</link> page for more information on the types of transport
+that are currently available.
</p>
-<media type="image" src="media/tor-launcher-configure_en-US.png" />
+<section id="using-transports">
+<title>Using pluggable transports</title>
+<steps>
+ <item>
+ <p>
+ To use pluggable transports, click "Configure" in the Tor Launcher
+ window that appears when you first run Tor Browser.
+ </p>
-<p>
-Select yes when asked if your internet service provider blocks connections
-to Tor."
-</p>
+ <media type="image" src="media/tor-launcher-configure_en-US.png" />
-<media type="image" src="media/tor-launcher-wizard_en-US.png" />
+ <p>
+ You can also configure pluggable transports while Tor Browser is
+ running, by clicking on the Torbutton menu and selecting â??Tor Network
+ Settingsâ??.
+ </p>
-<p>
-Select "Connect with provided bridges". Tor Browser has three Pluggable
-Transports to choose from. If one fails to get you online, try selecting a
-different transport.
-</p>
+ <!-- XXX: insert screenshot of Torbutton menu -->
+ </item>
-<media type="image" src="media/tor-launcher-provided-bridges_en-US.png" />
+ <item>
+ <p>
+ Select â??yesâ?? when asked if your Internet Service Provider blocks
+ connections to the Tor network.
+ </p>
+
+ <media type="image" src="media/tor-launcher-wizard_en-US.png" />
+ </item>
+
+ <item>
+ <p>
+ Select â??Connect with provided bridgesâ??. Tor Browser currently has nine
+ pluggable transport options to choose from. If one fails to get you
+ online, try selecting a different transport.
+ </p>
+
+ <!-- XXX: Update this image -->
+ <media type="image" src="media/tor-launcher-provided-bridges_en-US.png" />
+ </item>
+</steps>
<p>
-If you try all three transports, and none of them get you online, select
-"Enter custom bridges", and enter bridges manually. Read the <link
-xref='bridges'>Getting Bridges</link> section for instructions on getting
-custom bridges.
+If you try all of these options, and none of them gets you online,
+you will need to enter bridge addresses manually. Read the <link
+xref='bridges'>Bridges</link> section to learn what bridges are and how
+to obtain them.
</p>
+</section>
</page>
-
diff --git a/C/first-time.page b/C/first-time.page
new file mode 100644
index 0000000..095380b
--- /dev/null
+++ b/C/first-time.page
@@ -0,0 +1,68 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="topic"
+ id="first-time">
+
+ <info>
+ <link type="guide" xref="index" group="#first" />
+ <desc>Learn how to use Tor Browser for the first time</desc>
+ </info>
+
+ <title>Running Tor Browser for the First Time</title>
+
+ <p>
+ When you run Tor Browser for the first time, you will see the Tor
+ Launcher window. This offers you the option to connect directly to the
+ Tor network, or to configure Tor Browser for your connection.
+ </p>
+
+ <section id="connect">
+ <title>Connect</title>
+ <p>
+ In most cases, this option will allow you to connect to the Tor network
+ without any further configuration. Once clicked, a status bar will
+ appear, showing Torâ??s connection progress. If you are on a relatively
+ fast connection, but this bar seems to get stuck at a certain point,
+ see the <link xref='troubleshooting'>Troubleshooting</link> page for
+ help solving the problem.
+ </p>
+ </section>
+ <section id="configure">
+ <title>Configure</title>
+ <p>
+ If you know that your connection is censored, or uses a proxy, you should
+ select this option. Tor Launcher will take you through a series of
+ configuration options.
+ </p>
+ <steps>
+ <item>
+ <p>
+ The first screen asks if access to the Tor network is blocked or
+ censored on your connection. If you do not believe this is the case,
+ select â??Noâ??. If you know your connection is censored, or you have
+ tried and failed to connect to the Tor network and no other solutions
+ have worked, select â??Yesâ??. You will then be taken to the <link
+ xref='circumvention'>Circumvention</link> screen to configure
+ a pluggable transport.
+ </p>
+ </item>
+ <item>
+ <p>
+ The next screen asks if your connection uses a proxy. In most cases,
+ this is not necessary. You will usually know if you need to answer
+ â??Yesâ??, as the same settings will be used for other browsers on your
+ system. If possible, ask your network administrator for guidance. If
+ your connection does not use a proxy, answer â??Noâ??.
+ </p>
+ </item>
+ <item>
+ <p>
+ The final screen asks if your connection is behind a firewall that
+ only allows certain ports. If the answer is â??Yesâ??, enter all the
+ allowed ports, separated by a comma but no spaces. If the answer is
+ â??Noâ??, click â??Connectâ??.
+ </p>
+ </item>
+ </steps>
+ </section>
+
+</page>
diff --git a/C/known-issues.page b/C/known-issues.page
index 327b8be..d4b87b8 100644
--- a/C/known-issues.page
+++ b/C/known-issues.page
@@ -1,11 +1,10 @@
-
<page xmlns="http://projectmallard.org/1.0/";
type="topic"
id="known-issues">
<info>
<desc>A list of known issues.</desc>
- <link type="guide" xref="index" group="#last" />
+ <link type="topic" xref="troubleshooting" />
</info>
<title>Known Issues</title>
@@ -67,9 +66,4 @@
</p>
</item>
</list>
-<p>
-If you have an issue with Tor Browser that isn't on this list, feel free to
-email help@xxxxxxxxxxxxxxxxxx
-</p>
</page>
-
diff --git a/C/managing-identities.page b/C/managing-identities.page
new file mode 100644
index 0000000..eb86ed6
--- /dev/null
+++ b/C/managing-identities.page
@@ -0,0 +1,129 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="topic"
+ id="managing-identities">
+
+<info>
+ <desc>Learn how to control personally-identifying information in Tor Browser</desc>
+ <link type="guide" xref="index" />
+</info>
+
+<title>Managing Identities</title>
+
+<p>
+When you connect to a website, it is not only the operators
+of that website who can record information about your visit. Most
+websites now use numerous third-party services, including social networking
+â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which
+can link your activity across different sites.
+</p>
+
+<p>
+Using the Tor network stops observers from being able to
+discover your exact location and IP address, but even without this
+information they might be able to link different areas of
+your activity together. For this reason, Tor Browser includes some additional
+features that help you control what information can be tied to your identity.
+</p>
+
+<section id="url-bar">
+<title>The URL bar</title>
+<p>
+Tor Browser centers your web experience around your relationship with
+the website in the URL bar. Even if you connect to two different sites
+that use the same third-party tracking service, Tor Browser will force
+the content to be served over two different Tor circuits, so the tracker will
+not know that both connections originate from your browser.
+</p>
+
+<p>
+On the other hand, all connections to a single website address will be
+made over the same Tor circuit, meaning you can browse different pages
+of a single website in separate tabs or windows, without any loss of
+functionality.
+</p>
+</section>
+
+<section id="logins">
+<title>Logging in over Tor</title>
+<p>
+Although Tor Browser is designed to enable total user anonymity on the web,
+there may be situations in which it makes sense to use Tor with websites
+that require usernames, passwords, or other identifying information.
+</p>
+
+<p>
+If you log into a website using a regular browser, you also reveal your
+IP address and geographical location in the process. The same is often
+true when you send an email. Logging into your social networking or
+email accounts using Tor Browser allows you to choose exactly which
+information you reveal to the websites you browse. Logging in using Tor
+Browser is also useful if the website you are trying to reach is
+censored on your network.
+</p>
+
+<p>
+When you log in to a website over Tor, there are several points you
+should bear in mind:
+</p>
+
+<list>
+ <item>
+ <p>
+ See the <link
+ xref='secure-connections'>Secure Connections</link> page
+ for important information on how to secure your connection when
+ logging in.
+ </p>
+ </item>
+ <item>
+ <p>
+ Tor Browser often makes your connection appear as though it is coming
+ from an entirely different part of the world. Some websites, such as
+ banks or email providers, might interpret this as a sign that your
+ account has been hacked or compromised, and lock you out. The only
+ way to resolve this is by following the siteâ??s recommended procedure
+ for account recovery, or contacting the operators and explaining the
+ situation.
+ </p>
+ </item>
+</list>
+</section>
+
+<section id="new-identity">
+<title>Changing identities and circuits</title>
+<p>
+Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ??
+options, located in the Torbutton menu.
+</p>
+
+<terms>
+ <item>
+ <title>New Identity</title>
+ <p>
+ This option is useful if you want to prevent your subsequent browser
+ activity from being linkable to what you
+ were doing before. Selecting it will close all your open tabs and
+ windows, clear all private information such as cookies and browsing
+ history, and use new Tor circuits for all connections. Make sure you
+ have completely finished all activity and downloads before clicking
+ â??New Identityâ??, as you will not be able to resume them in the new
+ browser window without starting all over again.
+ </p>
+ </item>
+ <item>
+ <title>New Tor Circuit for this Site</title>
+ <p>
+ This option is useful if the <link
+ xref='about-tor-browser#how-tor-works'>exit relay</link> you are
+ using is unable to connect to the website you require, or is not
+ loading it properly. Selecting it will cause the currently-active
+ tab or window to be reloaded over a new Tor circuit. Other open tabs
+ and windows from the same website will use the new circuit as well
+ once they are reloaded. This option does not clear any private
+ information or unlink your activity, nor does it affect your current
+ connections to other websites.
+ </p>
+ </item>
+ </terms>
+</section>
+</page>
diff --git a/C/onionsites.page b/C/onionsites.page
new file mode 100644
index 0000000..809f099
--- /dev/null
+++ b/C/onionsites.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="topic"
+ id="onionsites">
+
+<info>
+ <desc>Websites hosted in the Tor network</desc>
+ <link type="guide" xref="index" />
+</info>
+
+<title>Onionsites</title>
+<p>
+Onionsites (also known as â??hidden servicesâ??) are websites that are only
+accessible through the Tor network.
+</p>
+
+<p>
+Onionsites offer several advantages over ordinary sites on the
+non-private web:
+</p>
+
+<list>
+ <item>
+ <p>
+ An onionsiteâ??s location and IP address are hidden, making it difficult
+ for adversaries to censor it or identify its operators.
+ </p>
+ </item>
+ <item>
+ <p>
+ All traffic between Tor users and onionsites is end-to-end encrypted,
+ so you do not need to worry about <link
+ xref='secure-connections'>connecting over HTTPS</link>.
+ </p>
+ </item>
+ <item>
+ <p>
+ The address of an onionsite is automatically generated, so the
+ operators do not need to purchase a domain name; the .onion URL also
+ helps Tor ensure that it is connecting to the right location and that
+ the connection is not being tampered with.
+ </p>
+ </item>
+</list>
+
+<section id="access">
+<title>How to access an onionsite</title>
+<p>
+Just like any other website, you will need to know the address of an
+onionsite in order to connect to it. An onion address is a string of
+sixteen mostly random letters and numbers, followed by â??.onionâ??.
+</p>
+</section>
+
+<section id="troubleshooting">
+<title>Troubleshooting</title>
+<p>
+If you cannot reach the onionsite you require, make sure that you have
+entered the 16-character onion address correctly: even a small mistake
+will stop Tor Browser from being able to reach the site.
+</p>
+<p>
+If you are still unable to connect to the onionsite, please try again
+later. There may be a temporary connection issue, or the site operators
+may have allowed it to go offline without warning.
+</p>
+</section>
+</page>
diff --git a/C/plugins.page b/C/plugins.page
new file mode 100644
index 0000000..9d7e9c2
--- /dev/null
+++ b/C/plugins.page
@@ -0,0 +1,70 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="topic"
+ id="plugins">
+
+<info>
+ <desc>How Tor Browser handles browser plugins and add-ons</desc>
+ <link type="guide" xref="index" group="#last" />
+</info>
+
+<title>Flash, JavaScript, and other add-ons</title>
+
+<section id="flash">
+<title>Flash Player</title>
+ <p>
+ Video websites, such as YouTube and Vimeo, make use of the
+ Flash Player plugin to display video content. Unfortunately, this
+ software operates independently of Tor Browser and cannot easily be
+ made to obey Tor Browserâ??s proxy settings. It can therefore reveal your
+ real location and IP address to the website operators, or to an outside
+ observer. For this reason, Flash is disabled by default in Tor Browser,
+ and enabling it is not recommended.
+ </p>
+ <p>
+ Some video websites offer alternative video delivery methods that do
+ not use Flash. These methods may be compatible with Tor Browser.
+ </p>
+</section>
+
+<section id="javascript">
+<title>JavaScript</title>
+<p>
+JavaScript is a programming language that websites use to offer
+interactive elements such as video, animation, audio, and status
+timelines. Unfortunately, JavaScript can also enable attacks on the
+security of the browser, which might lead to deanonymization.
+</p>
+
+<p>
+Tor Browser includes an add-on called NoScript, accessed through the
+â??Sâ?? icon at the top-left of the window, which allows you to control the
+JavaScript that runs on individual web pages, or to block it entirely.
+</p>
+
+<p>
+Users who require a high degree of security in their web browsing should
+select â??Forbid Scripts Globallyâ?? from the NoScript drop-down menu. This
+setting is also activated by default when Tor Browserâ??s <link
+xref='security-slider'>Security Slider</link> is set to â??Medium-Highâ??
+(for non-HTTPS websites) or â??Highâ?? (for all websites). However, disabling
+JavaScript will prevent many websites from displaying correctly, so Tor
+Browserâ??s default setting is to allow all websites to run scripts.
+</p>
+</section>
+
+<section id="add-ons">
+<title>Browser Add-ons</title>
+<p>
+Tor Browser is based on Firefox, and any browser add-ons or themes that
+are compatible with Firefox can also be installed in Tor Browser.
+</p>
+
+<p>
+However, the only add-ons that have been tested for use with Tor Browser
+are those included by default. Installing any other browser
+add-ons may break functionality in Tor Browser or cause more serious
+problems that affect your privacy and security, and is done at your own
+risk.
+</p>
+</section>
+</page>
diff --git a/C/secure-connections.page b/C/secure-connections.page
new file mode 100644
index 0000000..bc95244
--- /dev/null
+++ b/C/secure-connections.page
@@ -0,0 +1,118 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ xmlns:its="http://www.w3.org/2005/11/its";
+ xmlns:xi="http://www.w3.org/2001/XInclude";
+ type="topic"
+ id="secure-connections">
+
+ <info>
+ <desc>Learn how to protect your data using Tor Browser and HTTPS</desc>
+ <link type="guide" xref="index" />
+ </info>
+
+ <title>Secure Connections</title>
+
+ <p>
+ If personal information such as a login password travels
+ unencrypted over the Internet, it can very easily be intercepted by an
+ eavesdropper. If you are logging into any website, you should
+ make sure that the site offers HTTPS encryption, which protects against
+ this kind of eavesdropping. You can verify this in the URL bar: if your
+ connection is encrypted, the address will begin with â??https://â;??, rather
+ than â??http://â;??.
+ </p>
+
+ <p>
+ The following visualization shows what information is visible to
+ eavesdroppers with and without Tor Browser and HTTPS encryption:
+ </p>
+
+ <xi:include href="media/tor-and-https.svg" />
+
+ <list>
+ <item>
+ <p>
+ Click the â??Torâ?? button to see what data is visible to
+ observers when you're using Tor. The button will turn green to
+ indicate that Tor is on.
+ </p>
+ </item>
+ <item>
+ <p>
+ Click the â??HTTPSâ?? button to see what data is visible to
+ observers when you're using HTTPS. The button will turn green to
+ indicate that HTTPS is on.
+ </p>
+ </item>
+ <item>
+ <p>
+ When both buttons are green, you see the data that is visible to
+ observers when you are using both tools.
+ </p>
+ </item>
+ <item>
+ <p>
+ When both buttons are grey, you see the data that is visible
+ to observers when you don't use either tool.
+ </p>
+ </item>
+ </list>
+ <terms>
+ <title>Potentially visible data</title>
+ <item>
+ <title its:translate="no">
+ <xi:include href="media/tor-and-https.svg" parse="xml"
+ xpointer="xpointer(//*[@id='string-site']/text())">
+ <xi:fallback>site.com</xi:fallback>
+ </xi:include>
+ </title>
+ <p>
+ The site being visited.
+ </p>
+ </item>
+ <item>
+ <title its:translate="no">
+ <xi:include href="media/tor-and-https.svg" parse="xml"
+ xpointer="xpointer(//*[@id='string-login']/text())">
+ <xi:fallback>user / pw</xi:fallback>
+ </xi:include>
+ </title>
+ <p>
+ Username and password used for authentication.
+ </p>
+ </item>
+ <item>
+ <title its:translate="no">
+ <xi:include href="media/tor-and-https.svg" parse="xml"
+ xpointer="xpointer(//*[@id='string-data']/text())">
+ <xi:fallback>data</xi:fallback>-->
+ </xi:include>
+ </title>
+ <p>
+ Data being transmitted.
+ </p>
+ </item>
+ <item>
+ <title its:translate="no">
+ <xi:include href="media/tor-and-https.svg" parse="xml"
+ xpointer="xpointer(//*[@id='string-location']/text())">
+ <xi:fallback>location</xi:fallback>
+ </xi:include>
+ </title>
+ <p>
+ Network location of the computer used to visit the website (the public
+ IP address).
+ </p>
+ </item>
+ <item>
+ <title its:translate="no">
+ <xi:include href="media/tor-and-https.svg" parse="xml"
+ xpointer="xpointer(//*[@id='string-tor']/text())">
+ <xi:fallback>Tor</xi:fallback>
+ </xi:include>
+ </title>
+ <p>
+ Whether or not Tor is being used.
+ </p>
+ </item>
+ </terms>
+</page>
diff --git a/C/security-slider.page b/C/security-slider.page
new file mode 100644
index 0000000..17abe9d
--- /dev/null
+++ b/C/security-slider.page
@@ -0,0 +1,76 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="topic"
+ id="security-slider">
+
+<info>
+ <desc>Configuring Tor Browser for security and usability</desc>
+ <link type="guide" xref="index" />
+</info>
+
+<title>Security Slider</title>
+<p>
+Tor Browser includes a â??Security Sliderâ?? that lets you
+increase your security by disabling certain web features that can be
+used to attack your security and anonymity. Increasing Tor Browserâ??s
+security level will stop some web pages from functioning properly, so
+you should weigh your security needs against the degree of usability
+you require.
+</p>
+
+<section id="access">
+<title>Accessing the Security Slider</title>
+<p>
+The Security Slider is located in Torbuttonâ??s â??Privacy and Security
+Settingsâ?? menu.
+</p>
+</section>
+
+<section id="levels">
+<title>Security Levels</title>
+<p>
+Increasing the level of the Security Slider will disable or partially
+disable certain browser features to protect against possible attacks.
+</p>
+
+<terms>
+ <item>
+ <title>Low</title>
+ <p>
+ At this level, all browser features are enabled. This is the most
+ usable option.
+ </p>
+ </item>
+ <item>
+ <title>Medium-Low</title>
+ <p>
+ At this level, HTML5 video and audio media become click-to-play via
+ NoScript; some <link xref='plugins'>JavaScript</link> performance
+ optimizations are disabled, causing some websites to run more slowly;
+ and some mathematical equations may not display properly.
+ </p>
+ </item>
+ <item>
+ <title>Medium-High</title>
+ <p>
+ At this level, HTML5 video and audio media become click-to-play via
+ NoScript; all JavaScript performance optimizations are disabled; some
+ mathematical equations may not display properly; some font rendering
+ features are disabled; some types of image are disabled; and
+ JavaScript is disabled by default on all non-<link
+ xref='secure-connections'>HTTPS</link> sites.
+ </p>
+ </item>
+ <item>
+ <title>High</title>
+ <p>
+ At this level, HTML5 video and audio media become click-to-play via
+ NoScript; all JavaScript performance optimizations are disabled; some
+ mathematical equations may not display properly; some font rendering
+ features are disabled; some types of image are disabled; Javascript
+ is disabled by default on all sites; most video and audio formats are
+ disabled; and some fonts and icons may not display correctly.
+ </p>
+ </item>
+</terms>
+</section>
+</page>
diff --git a/C/tor.page b/C/tor.page
deleted file mode 100644
index 2e86158..0000000
--- a/C/tor.page
+++ /dev/null
@@ -1,228 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/";
- xmlns:its="http://www.w3.org/2005/11/its";
- xmlns:xi="http://www.w3.org/2001/XInclude";
- type="topic"
- id="tor">
-
- <info>
- <link type="guide" xref="index" group="#first"/>
- <desc>Learn what Tor can do to protect your privacy and anonymity.</desc>
- </info>
-
- <title>Tor</title>
-
- <section id="what-tor-will-do">
- <title>What Tor will do</title>
-
- <p>
- The <app its:translate="no">Tor Browser</app> uses the <app
- its:translate="no">Tor</app> network to protect your privacy
- and anonymity. Using the <app its:translate="no">Tor</app> network has two
- main properties:
- </p>
-
- <list>
- <item>
- <p>
- The Internet access provider will not be able to learn the sites
- being visited and will not be able to monitor the content of
- the communication.
- </p>
- </item>
- <item>
- <p>
- The sites will see a connection coming from the <app
- its:translate="no">Tor</app> network and will not learn
- the actual Internet connection used to visit them.
- </p>
- </item>
- </list>
-
- <p>
- On top of that, the <app its:translate="no">Tor Browser</app> is designed
- to minimize the ability of websites to fingerprint the browser.
- </p>
- <p>
- The Tor Browser does not keep any browsing history. <em>Cookies</em>
- are only valid for a single session: until the <app its:translate="no">Tor
- Browser</app> is exited or a <!-- XXX: add link --><gui>New Identity</gui>
- is requested.
- </p>
-
- <!-- XXX: add Tor Browser team/mikeperry about things that are worth
- adding here. -->
- </section>
-
- <section id="what-tor-will-not-do">
- <title>What Tor will <em>not</em> do</title>
-
- <p>
- <app its:translate="no">Tor</app> and the <app its:translate="no">Tor
- Browser</app> will protect your privacy and anonymity only if used
- appropriately.
- </p>
-
- <list>
- <item>
- <p>
- <app its:translate="no">Tor</app> will not encrypt the whole
- communication. What is sent to the <app its:translate="no">Tor</app>
- network is what leaves the <app its:translate="no">Tor</app> network.
- For web browsing, this means that any confidential information
- should be sent using the HTTPS protocol.
- <!-- XXX: add a link to another topic page / document HTTPS Everywhere
- -->
- <!-- XXX: mention hidden services? -->
- </p>
- </item>
- <item>
- <p>
- If you give a website identifying information (e.g. a name, a
- <em>login</em>), you will no longer be an anonymous visitor of this
- website.
- </p>
- </item>
- <item>
- <p>
- If you transfer files, they can contain identifying information in their
- metadata, like the camera serial number.
- </p>
- </item>
- <item>
- <p>
- Only connections made through the <app its:translate="no">Tor
- Browser</app> will go through the <app its:translate="no">Tor</app>
- network. Unless specific steps are taken, other applications on your
- computer will continue to do direct Internet connections and can
- reveal your location.
- <!-- XXX: add topic page on how to deal with external documents? /
- mention Tails? -->
- </p>
- </item>
- </list>
-
- <p>
- If loosing control over some information might have problematic
- consequences, it is sometimes better to leave it off computers entirely.
- </p>
- </section>
-
- <section id="how-tor-works">
- <title>How Tor works</title>
-
- <p>
- Tor is a network of virtual tunnels that allows you to improve your
- privacy and security on the Internet. Tor works by sending your
- traffic through three random servers (also known as <em>relays</em>)
- in the Tor network, before the traffic is sent out onto the public
- Internet
- </p>
- <media type="image" src="media/how-tor-works.png" />
- <p>
- The image above illustrates a user browsing to different websites
- over Tor. The green monitors represent relays in the Tor network,
- while the three keys represent the layers of encryption between the
- user and each relay.
- </p>
- </section>
-
- <section id="tor-and-https">
- <title>Tor and HTTPS</title>
-
- <p>
- The following visualization helps understanding what data are visible to
- eavesdroppers with or without the <app its:translate="no">Tor Browser</app>
- and when encrypted connections (HTTPS) or not:
- </p>
-
- <xi:include href="media/tor-and-https.svg" />
-
- <list>
- <item>
- <p>
- Click the <gui>Tor</gui> button to see what data is visible to
- eavesdroppers when you're using Tor. The button will turn green to
- indicate that Tor is on.
- </p>
- </item>
- <item>
- <p>
- Click the <gui>HTTPS</gui> button to see what data is visible to
- eavesdroppers when you're using HTTPS. The button will turn green to
- indicate that HTTPS is on.
- </p>
- </item>
- <item>
- <p>
- When both buttons are green, you see the data that is visible to
- eavesdroppers when you are using both tools.
- </p>
- </item>
- <item>
- <p>
- When both buttons are grey, you see the data that is visible
- to eavesdroppers when you don't use either tool.
- </p>
- </item>
- </list>
- <terms>
- <title>Potentially visible data</title>
- <item>
- <title its:translate="no">
- <xi:include href="media/tor-and-https.svg" parse="xml"
- xpointer="xpointer(//*[@id='string-site']/text())">
- <xi:fallback>site.com</xi:fallback>
- </xi:include>
- </title>
- <p>
- The site being visited.
- </p>
- </item>
- <item>
- <title its:translate="no">
- <xi:include href="media/tor-and-https.svg" parse="xml"
- xpointer="xpointer(//*[@id='string-login']/text())">
- <xi:fallback>user / pw</xi:fallback>
- </xi:include>
- </title>
- <p>
- Username and password used for authentication.
- </p>
- </item>
- <item>
- <title its:translate="no">
- <xi:include href="media/tor-and-https.svg" parse="xml"
- xpointer="xpointer(//*[@id='string-data']/text())">
- <xi:fallback>data</xi:fallback>-->
- </xi:include>
- </title>
- <p>
- Data being transmited.
- </p>
- </item>
- <item>
- <title its:translate="no">
- <xi:include href="media/tor-and-https.svg" parse="xml"
- xpointer="xpointer(//*[@id='string-location']/text())">
- <xi:fallback>location</xi:fallback>
- </xi:include>
- </title>
- <p>
- Network location of the computer used to visit the website (the public
- IP address).
- </p>
- </item>
- <item>
- <title its:translate="no">
- <xi:include href="media/tor-and-https.svg" parse="xml"
- xpointer="xpointer(//*[@id='string-tor']/text())">
- <xi:fallback>Tor</xi:fallback>
- </xi:include>
- </title>
- <p>
- Whether or not Tor is being used.
- </p>
- </item>
- </terms>
- </section>
-</page>
diff --git a/C/transports.page b/C/transports.page
new file mode 100644
index 0000000..03dc89b
--- /dev/null
+++ b/C/transports.page
@@ -0,0 +1,112 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="topic"
+ id="transports">
+
+<info>
+ <desc>Types of pluggable transport</desc>
+ <link type="topic" xref="circumvention" />
+</info>
+
+<title>Pluggable Transports</title>
+
+<p>
+Pluggable transports are tools that Tor can use to disguise the
+traffic it sends out. This can be useful in situations where an Internet
+Service Provider or other authority is actively blocking connections to
+the Tor network.
+</p>
+
+<section id="types">
+<title>Types of pluggable transport</title>
+<p>
+Currently there are six pluggable transports available, but more are
+being developed.
+</p>
+<table frame='all' rules='all'>
+ <tr>
+ <td>
+ <p>
+ obfs2
+ </p>
+ </td>
+ <td>
+ <p>
+ Censors have learned how to identify obfs2 bridges. This transport
+ is deprecated, and you should not use it.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ obfs3
+ </p>
+ </td>
+ <td>
+ <p>
+ obfs3 disguises Tor traffic as random noise. obfs3 bridges work
+ almost everywhere, though some may have been identified and
+ blocked by censors.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ Scramblesuit
+ </p>
+ </td>
+ <td>
+ <p>
+ Scramblesuit is an additional tool for the obfs3 transport that
+ tries to stop censors from identifying bridges through active
+ probing.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ obfs4
+ </p>
+ </td>
+ <td>
+ <p>
+ obfs4 offers the same features as Scramblesuit, but uses different
+ cryptographic and authentication methods that result in improved
+ speed.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ meek
+ </p>
+ </td>
+ <td>
+ <p>
+ Rather than using bridges, meek works by making your Tor traffic
+ seem as though it is destined for a major website that a censor
+ cannot block without disrupting a lot of other activity on the
+ network.
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ FTE
+ </p>
+ </td>
+ <td>
+ <p>
+ Format-Transforming Encryption disguises Tor traffic as web (HTTP)
+ traffic or other types of internet traffic. FTE bridges are
+ effective, but in limited supply.
+ </p>
+ </td>
+ </tr>
+</table>
+</section>
+</page>
diff --git a/C/troubleshooting.page b/C/troubleshooting.page
index d1cda52..952a0a5 100644
--- a/C/troubleshooting.page
+++ b/C/troubleshooting.page
@@ -1,54 +1,119 @@
-
<page xmlns="http://projectmallard.org/1.0/";
type="topic"
id="troubleshooting">
<info>
- <desc>What to do if Tor Browser doesn't work.</desc>
+ <desc>What to do if Tor Browser doesnâ??t work.</desc>
<link type="guide" xref="index" group="#last" />
</info>
<title>Troubleshooting</title>
<p>
-The Tor Browser should get you online automatically after clicking the
-"Connect" button on the start up screen.
+You should be able to start browsing the web using Tor Browser shortly
+after running the program, and clicking the â??Connectâ?? button if you are
+using it for the first time.
</p>
<media type="image" src="media/tor-launcher-connect_en-US.png" />
+<section id="no-connection">
+<title>Quick fixes</title>
<p>
-If it doesn't connect, there may be a simple fix. Try each of the following:
+If Tor Browser doesnâ??t connect, there may be a simple solution. Try each
+of the following:
</p>
<list>
<item>
- <p>Make sure another Tor Browser is not already running. If you're
- not sure if Tor Browser is running, restart your computer.</p>
+ <p>
+ Your computerâ??s system clock must be set correctly, or Tor will not
+ be able to connect.
+ </p>
+ </item>
+ <item>
+ <p>
+ Make sure another Tor Browser is not already running. If youâ??re
+ not sure if Tor Browser is running, restart your computer.
+ </p>
</item>
<item>
- <p>'Allow' Tor in your antivirus program.</p>
+ <p>
+ Make sure that any antivirus program you have installed is not
+ preventing Tor from running. You may need to consult the
+ documentation for your antivirus software if you do not know how to
+ do this.
+ </p>
</item>
<item>
- <p>Temporarily disable your firewall.</p>
+ <p>
+ Temporarily disable your firewall.
+ </p>
</item>
<item>
- <p>Delete Tor Browser and install it again. If updating, do not overwrite
- your previous Tor Browser files.</p>
+ <p>
+ Delete Tor Browser and install it again. If updating, do not just
+ overwrite your previous Tor Browser files; ensure they are fully
+ deleted beforehand.
+ </p>
</item>
</list>
+</section>
+<section id="blocked">
+<title>Is your connection censored?</title>
<p>
-If you still can't connect, your internet service provider might be censoring
-connections to Tor. Follow the instructions in the <link
-xref='circumvention'>Circumvention</link> section.
+If you still canâ??t connect, your Internet Service Provider might be
+censoring connections to the Tor network. Read the <link
+xref='circumvention'>Circumvention</link> section for possible
+solutions.
</p>
+</section>
+<section id="known-issues">
+<title>Known issues</title>
<p>
-If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx
-with your operating system, the details of your problem, and what you've
-already tried.
+Tor Browser is under constant development, and some issues are known
+about but not yet fixed. Please check the <link
+xref='known-issues'>Known Issues</link> page to see if the problem you
+are experiencing is already listed there.
</p>
+</section>
-</page>
+<section id="helpdesk">
+<title>Contacting the Tor Help Desk</title>
+<p>
+If the above steps do not help you solve the problem, you can contact
+Torâ??s help desk. Send an email to help@xxxxxxxxxxxxxxxxx with exact
+details of the problem, your operating system, and the steps you have
+already tried. Please only contact the help desk if you cannot find the
+answer to your question in this manual.
+</p>
+
+<p>
+If possible, you should also include the â??Tor logâ??, an
+automatically-generated list of Torâ??s activity that can help diagnose
+the problem. To copy the Tor log, either:
+</p>
+<list>
+ <item>
+ <p>
+ click the button labelled â??Copy Tor Log To Clipboardâ?? that appears in
+ the dialog window while Tor Browser is connecting to the network, or
+ </p>
+ </item>
+ <item>
+ <p>
+ if Tor Browser is already open, click on the Torbutton icon (the small
+ green onion at the top left of the screen), then â??Open Network
+ Settingsâ??, then â??Copy Tor Log To Clipboardâ??.
+ </p>
+ </item>
+</list>
+<p>
+You can now paste the Tor log into your support request.
+</p>
+<!-- XXX: Include a screenshot of this -->
+</section>
+</page>
diff --git a/C/uninstalling.page b/C/uninstalling.page
index 5c8ca62..4deef86 100644
--- a/C/uninstalling.page
+++ b/C/uninstalling.page
@@ -1,29 +1,29 @@
-
<page xmlns="http://projectmallard.org/1.0/";
type="topic"
id="uninstalling">
<info>
<desc>How to remove Tor Browser from your system.</desc>
- <link type="guide" xref="index"/>
+ <link type="guide" xref="index" group="#last" />
</info>
<title>Uninstalling</title>
<p>
-The Tor Browser does not affect any of the existing software
-or settings on your computer. Uninstalling Tor Browser will not affect your
-system's software or settings either.
+Tor Browser does not affect any of the existing software or settings on
+your computer. Uninstalling Tor Browser will not affect your systemâ??s
+software or settings.
</p>
<p>
-Removing the Tor Browser from your system is simple:
+Removing Tor Browser from your system is simple:
</p>
<steps>
<item>
<p>Locate your Tor Browser folder. The default location is your Desktop.</p>
- </item>
+ <!-- is that true? -->
+ </item>
<item>
<p>Delete the Tor Browser folder.</p>
</item>
@@ -33,8 +33,8 @@ Removing the Tor Browser from your system is simple:
</steps>
<p>
-Note that your operating system's standard "Uninstall" utility is not used.
+Note that your operating systemâ??s standard â??Uninstallâ?? utility is not
+used.
</p>
</page>
-
diff --git a/C/updating.page b/C/updating.page
new file mode 100644
index 0000000..1298893
--- /dev/null
+++ b/C/updating.page
@@ -0,0 +1,73 @@
+<page xmlns="http://projectmallard.org/1.0/";
+ type="topic"
+ id="updating">
+
+<info>
+ <desc>How to update Tor Browser</desc>
+ <link type="guide" xref="index" />
+</info>
+
+<title>Updating</title>
+
+<p>
+Tor Browser must be kept updated at all times. If you continue to use an
+outdated version of the software, you may be vulnerable to serious
+security flaws that compromise your privacy and anonymity.
+</p>
+
+<p>
+Tor Browser will prompt you to update the software once a new version
+has been released: the Torbutton icon will display a yellow triangle,
+and you may see a written update indicator when Tor Browser opens. You
+can update either automatically or manually.
+</p>
+
+<!-- XXX: Screenshot of update warning, plus screenshots for all the steps below -->
+
+<section id="automatic">
+<title>Updating Tor Browser automatically</title>
+<steps>
+ <item>
+ <p>
+ When you are prompted to update Tor Browser, click on the Torbutton
+ icon, then select â??Check for Tor Browser Updateâ??.
+ </p>
+ </item>
+ <item>
+ <p>
+ When Tor Browser has finished checking for updates, click on the
+ â??Updateâ?? button and wait for the update to download and install.
+ </p>
+ </item>
+ <item>
+ <p>
+ Restart Tor Browser. You will now be running the latest version.
+ </p>
+ </item>
+</steps>
+</section>
+<section id="manual">
+<title>Updating Tor Browser manually</title>
+<steps>
+ <item>
+ <p>
+ When you are prompted to update Tor Browser, finish the browsing
+ session and close the program.
+ </p>
+ </item>
+ <item>
+ <p>
+ Remove Tor Browser from your system by deleting the folder that
+ contains it (see the <link xref='uninstalling'>Uninstalling</link>
+ section for more information).
+ </p>
+ </item>
+ <item>
+ <p>
+ Visit https://www.torproject.org and download a copy of the latest Tor
+ Browser release, then install it as before.
+ </p>
+ </item>
+</steps>
+</section>
+</page>
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits