commit bdbdf791f34bdf950b302182551a34c5f6e4e44a
Author: emma peel <emma.p...@riseup.net>
Date:   Fri Jul 16 14:38:33 2021 +0200

    updates for new tor connection
---
 content/bridges/contents.lr             | 34 ++++++++++++++++-----------------
 content/circumvention/contents.lr       | 12 ++++++------
 content/downloading/contents.lr         |  5 +----
 content/mobile-tor/contents.lr          |  5 +++--
 content/onion-services/contents.lr      |  8 +++++---
 content/plugins/contents.lr             |  2 +-
 content/running-tor-browser/contents.lr | 32 ++++++++++++++++---------------
 7 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr
index a94ad62..d9290e6 100644
--- a/content/bridges/contents.lr
+++ b/content/bridges/contents.lr
@@ -2,7 +2,7 @@ _model: topic
 ---
 title: BRIDGES
 ---
-description: Most Pluggable Transports, such as obfs4, rely on the use of 
“bridge” relays.
+description: Most Pluggable Transports, such as obfs4, rely on the use of 
"bridge" relays.
 ---
 seo_slug: bridges
 ---
@@ -10,7 +10,7 @@ key: 7
 ---
 body:
 
-Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use of 
“bridge” relays.
+Most [Pluggable Transports](/circumvention), such as 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 conceal the 
fact that you are using Tor, but may slow down the connection compared to using 
ordinary Tor relays.
@@ -23,32 +23,30 @@ Because bridge addresses are not public, you will need to 
request them yourself.
 
  * Visit [https://bridges.torproject.org/](https://bridges.torproject.org) and 
follow the instructions, or
  * Email [brid...@torproject.org](mailto:brid...@torproject.org) from a Gmail, 
or Riseup email address
- * Use MOAT to fetch bridges from within Tor Browser.
+ * Use Moat to fetch bridges from within Tor Browser.
 
 ### USING MOAT
 
-<img class="col-md-6" align="right" hspace="5" 
src="../../static/images/request-a-bridge.png" alt="Request a bridge from 
torproject.org">
+If you're starting Tor Browser for the first time, click "Tor Network 
Settings" to open the Tor settings window.
+Under the "Bridges" section, select the checkbox "Use a bridge", then choose 
"Request a bridge from torproject.org" and click "Request a Bridge..." for 
BridgeDB to provide a bridge.
+Complete the Captcha and click "Submit". Click "Connect" to save your settings.
 
-If you're starting Tor Browser for the first time, click "Configure" to open 
the Tor Network Settings window.
-After checking the checkbox "Tor is censored in my country," choose "Request a 
bridge from torproject.org" and click "Request a Bridge..." for BridgeDB to 
provide a bridge.
-Complete the Captcha and click "Submit." Click "Connect" to save your settings.
+Or, if you have Tor Browser running, click on "Preferences" (or "Options" on 
Windows) in the [hamburger menu 
(≡)](https://support.torproject.org/glossary/hamburger-menu/) and then on 
"Tor" in the sidebar.
+In the "Bridges" section, select the checkbox "Use a bridge", and from the 
option "Request a bridge from torproject.org", click "Request a New Bridge..." 
for BridgeDB to provide a bridge.
+Complete the Captcha and click "Submit". Your setting will automatically be 
saved once you close the tab.
 
-Or, if you have Tor Browser running, click on "Preferences" in the hamburger 
menu and then on "Tor" in the sidebar.
-In the "Bridges" section, check the checkbox "Use a bridge," and from the 
option "Request a bridge from torproject.org," click "Request a New Bridge..." 
for BridgeDB to provide a bridge.
-Complete the Captcha and click "Submit." Your setting will automatically be 
saved once you close the tab.
+<img class="col-md-6" src="../../static/images/request-a-bridge.png" 
alt="Request a bridge from torproject.org">
 
 ### ENTERING BRIDGE ADDRESSES
 
-<img class="col-md-6" align="right" hspace="5" 
src="../../static/images/tor-launcher-custom-bridges.png" alt="Enter custom 
bridge addresses">
-
-Once you have obtained some bridge addresses, you will need to enter them into 
Tor Launcher.
-
-If you're starting Tor Browser for the first time, click "Configure" to open 
the Tor Network Settings window.
-After checking the checkbox "Tor is censored in my country," choose "Provide a 
bridge I know" and enter each bridge address on a separate line.
+If you're starting Tor Browser for the first time, click "Tor Network 
Settings" to open the Tor settings window.
+Under the "Bridges" section, select the checkbox "Use a bridge", choose 
"Provide a bridge I know" and enter each bridge address on a separate line.
 Click "Connect" to save your settings.
 
-Or, if you have Tor Browser running, click on "Preferences" in the hamburger 
menu and then on "Tor" in the sidebar.
-In the "Bridges" section, check the checkbox "Use a bridge," and from the 
option "Provide a bridge I know," enter each bridge address on a separate line.
+Or, if you have Tor Browser running, click on "Preferences" (or "Options" on 
Windows) in the [hamburger menu 
(≡)](https://support.torproject.org/glossary/hamburger-menu/) and then on 
"Tor" in the sidebar.
+In the "Bridges" section, select the checkbox "Use a bridge", and from the 
option "Provide a bridge I know", enter each bridge address on a separate line.
 Your settings will automatically be saved once you close the tab.
 
+<img class="col-md-6" 
src="../../static/images/tor-launcher-custom-bridges.png" alt="Enter custom 
bridge addresses">
+
 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.
diff --git a/content/circumvention/contents.lr 
b/content/circumvention/contents.lr
index 2b98024..5f9023e 100644
--- a/content/circumvention/contents.lr
+++ b/content/circumvention/contents.lr
@@ -49,19 +49,19 @@ meek
 
 ### USING PLUGGABLE TRANSPORTS
 
-To use a pluggable transport, click "Configure" when starting Tor Browser for 
the first time.
-After checking the checkbox "Tor is censored in my country," choose the 
"Select a built-in bridge" option.
+To use a pluggable transport, click "Tor Network Settings" when starting Tor 
Browser for the first time.
+Under the "Bridges" section, select the checkbox "Use a bridge" and choose the 
"Select a built-in bridge" option.
 From the dropdown, select whichever pluggable transport you'd like to use.
-Once you've selected the pluggable transport, click "Connect" to save your 
settings.
+Once you've selected the pluggable transport, scroll up and click "Connect" to 
save your settings.
 
-Or, if you have Tor Browser running, click on "Preferences" in the hamburger 
menu and then on "Tor" in the sidebar.
-In the "Bridges" section, check the checkbox "Use a bridge," and from the 
option "Select a built-in bridge," choose whichever pluggable transport you'd 
like to use from the dropdown.
+Or, if you have Tor Browser running, click on "Preferences" (or "Options" on 
Windows) in the [hamburger menu 
(≡)](https://support.torproject.org/glossary/hamburger-menu/) and then on 
"Tor" in the sidebar.
+In the "Bridges" section, select the checkbox "Use a bridge", and from the 
option "Select a built-in bridge", choose whichever pluggable transport you'd 
like to use from the dropdown.
 Your settings will automatically be saved once you close the tab.
 
 
 ### WHICH TRANSPORT SHOULD I USE?
 
-Each of the transports listed in Tor Launcher’s menu works in a different 
way, and their effectiveness depends on your individual circumstances.
+Each of the transports listed in Tor Bridge's menu works in a different way, 
and their effectiveness depends on your individual circumstances.
 
 If you are trying to circumvent a blocked connection for the first time, you 
should try the different transports: obfs4, snowflake, or meek-azure.
 
diff --git a/content/downloading/contents.lr b/content/downloading/contents.lr
index d6e6aa9..5cb1b3c 100644
--- a/content/downloading/contents.lr
+++ b/content/downloading/contents.lr
@@ -29,7 +29,4 @@ If you're unable to download Tor Browser from the official 
Tor Project website,
 Send an email to [get...@torproject.org](mailto:get...@torproject.org), and in 
the body of the message simply write “windows”, “osx”, or “linux”, 
(without quotation marks) depending on your operating system.
 
 GetTor will respond with an email containing links from which you can download 
the Tor Browser package, the cryptographic signature (needed for verifying the 
download), the fingerprint of the key used to make the signature, and the 
package’s checksum. You may be offered a choice of “32-bit” or 
“64-bit” software: this depends on the model of the computer you are using.
-
-### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):
-
-To get links for downloading Tor Browser in Chinese for Linux, send a message 
to [get...@torproject.org](mailto:get...@torproject.org) with the words "linux 
zh" in it.
+For example, to get links for downloading Tor Browser in Chinese for Windows, 
send an email to [get...@torproject.org](mailto:get...@torproject.org) with the 
words "windows zh" in it.
diff --git a/content/mobile-tor/contents.lr b/content/mobile-tor/contents.lr
index 1032a42..a40e23a 100644
--- a/content/mobile-tor/contents.lr
+++ b/content/mobile-tor/contents.lr
@@ -110,7 +110,7 @@ If you choose the "Provide a Bridge I know" option, then 
you have to enter a [br
 
 <img style="max-width:300px" class="col-md-6" 
src="../../static/images/android-new-identity.png" alt="New Identity on Tor 
Browser for Android">
 
-When Tor Browser is running, you would see so in your phone's notification 
panel along with the button "NEW IDENTITY".
+When Tor Browser is running, you would see so in your device's notification 
panel after expanding it along with the button "NEW IDENTITY".
 Tapping on this button will provide you with a new identity.
 Unlike in Tor Browser for Desktop, the "NEW IDENTITY" button in Tor Browser 
for Android does not prevent your subsequent browser activity from being 
linkable to what you were doing before.
 Selecting it will only change your Tor circuit.
@@ -189,7 +189,8 @@ At the moment, there are some features which are not 
available in Tor Browser fo
 * You can't see your Tor circuit. 
[#25764](https://gitlab.torproject.org/tpo/applications/torbutton/-/issues/25764)
 * Tor Browser for Android does not connect when moved to the SD Card. 
[#31814](https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/31814)
 * You can't take screenshots while using Tor Browser for Android. 
[#27987](https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/27987)
  
-* Can't upload files with Tor Browser for Android. 
[#40283](https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/40283)
+* You can't upload files with Tor Browser for Android. 
[#40283](https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/40283)
+* You can't open onion addresses that requires Client Authorization 
[#31672](https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/31672)
 
 ### More about Tor on mobile devices
 
diff --git a/content/onion-services/contents.lr 
b/content/onion-services/contents.lr
index 8334f0c..085a4a5 100644
--- a/content/onion-services/contents.lr
+++ b/content/onion-services/contents.lr
@@ -20,7 +20,7 @@ Onion services offer several advantages over ordinary 
services on the non-privat
 
 ### HOW TO ACCESS AN ONION SERVICE
 
-Just like any other website, you will need to know the address of an onion 
service in order to connect to it. An onion address is a string of 16 (and in 
V3 format, 56) mostly random letters and numbers, followed by ".onion".
+Just like any other website, you will need to know the address of an onion 
service in order to connect to it. An onion address is a string of 56 mostly 
random letters and numbers, followed by ".onion".
 
 When accessing a website that uses an onion service, Tor Browser will show in 
the URL bar an icon of an onion displaying the state of your connection: secure 
and using an onion service.
 You can learn more about the onion site that you are visiting by looking at 
the Circuit Display.
@@ -44,7 +44,7 @@ In order to access this service, you will need access 
credentials from the onion
 When accessing an authenticated onion service, Tor Browser will show in the 
URL bar an icon of a little gray key, accompanied by a tooltip.
 Enter your valid private key into the input field.
 
-<img style="max-width:100%" class="col-md-6" 
src="../../static/images/client-auth.png" alt="Client Authorization">
+<img class="col-md-6" src="../../static/images/client-auth.png" alt="Client 
Authorization">
 
 ### ONION SERVICES ERRORS
 
@@ -70,4 +70,6 @@ If you cannot reach the onion service you requested, make 
sure that you have ent
 
 If you are still unable to connect to the onion service after verifying the 
address, please try again later. There may be a temporary connection issue, or 
the site operators may have allowed it to go offline without warning.
 
-You can also test if you are able to access other onion services by connecting 
to [DuckDuckGo's Onion Service](http://3g2upl4pq6kufc4m.onion/).
+If the onion service you are trying to access consists of a string of 16 
characters (V2 format), this type of address is [being 
deprecated](https://support.torproject.org/onionservices/v2-deprecation/).
+
+You can also test if you are able to access other onion services by connecting 
to [DuckDuckGo's Onion 
Service](https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/).
diff --git a/content/plugins/contents.lr b/content/plugins/contents.lr
index b0379dd..66bae53 100644
--- a/content/plugins/contents.lr
+++ b/content/plugins/contents.lr
@@ -19,7 +19,7 @@ Some video websites (such as YouTube) offer alternative video 
delivery methods t
 
 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.
 
-Tor Browser includes an add-on called NoScript. It's accessible through 
'Preferences' on hamburger menu (main menu), then select 'Customize' and drag 
the “S” icon to the top-right of the window. NoScript allows you to control 
the JavaScript (and other scripts) that runs on individual web pages, or block 
it entirely.
+Tor Browser includes an add-on called NoScript. It's accessible through 
"Preferences" (or "Options" on Windows) on the [hamburger menu 
(≡)](https://support.torproject.org/glossary/hamburger-menu/), then select 
'Customize' and drag the “S” icon to the top-right of the window. NoScript 
allows you to control the JavaScript (and other scripts) that runs on 
individual web pages, or block it entirely.
 
 Users who require a high degree of security in their web browsing should set 
Tor Browser’s [Security Level](../security-settings/) to “Safer” (which 
disables JavaScript for non-HTTPS websites) or “Safest” (which does so 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 in "Standard" mode.
 
diff --git a/content/running-tor-browser/contents.lr 
b/content/running-tor-browser/contents.lr
index 708d277..bf67ec6 100644
--- a/content/running-tor-browser/contents.lr
+++ b/content/running-tor-browser/contents.lr
@@ -10,36 +10,38 @@ key: 4
 ---
 body:
 
-When you run Tor Browser for the first time, you will see the Tor Network 
Settings window.
-This offers you the option to connect directly to the Tor network, or to 
configure Tor Browser for your connection.
+When you run Tor Browser for the first time, you will see the Connect to Tor 
window.
+This offers you the option to either connect directly to the Tor network, or 
to configure Tor Browser for your connection.
+There's a checkbox which asks whether you always want to get automatically 
connected to the Tor network, if this is the case, check the box.
 
 ### CONNECT
 
 <img class="col-md-6" src="../../static/images/connect.png" alt="Click 
'connect' to connect to Tor.">
 
 In most cases, choosing "Connect" 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.
+
+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 [Troubleshooting](../troubleshooting) page for help 
solving the problem.
+Or, if you know that your connection is censored or uses a proxy, you should 
click on "Tor Network Settings".
 
-### CONFIGURE
+<img class="col-md-6" src="../../static/images/configure.png" alt="Click 'Tor 
Network Settings' to adjust network settings.">
 
-<img class="col-md-6" src="../../static/images/configure.png" alt="Click 
'configure' to adjust network settings.">
+### CONFIGURE
 
-If you know that your connection is censored or uses a proxy, you should 
select this option.
+Tor Browser will take you through a series of configuration options.
 
-<img class="col-md-6" src="../../static/images/proxy_question.png" alt="Select 
options for censored connection or proxy use.">
+The first checkbox is Quickstart. If selected, every time you open Tor 
Browser, it will try to connect with your previous network settings.
 
-Tor Browser will take you through a series of configuration options.
+The second checkbox asks if you want to use a bridge. 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 "Use a bridge".
 
 <img class="col-md-6" src="../../static/images/pluggable-transport.png" 
alt="Configure Tor bridge options">
 
-The first checkbox asks if access to the Tor network is blocked or censored on 
your connection.
-If you do not believe this is the case, leave this unchecked.
-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, check the 
checkbox.
-This will display the [Circumvention](../circumvention) section to configure a 
pluggable transport.
+This will display the [Circumvention](../circumvention) section to configure a 
pluggable transport or to connect using [Bridges](../bridges).
 
-<img class="col-md-6" src="../../static/images/proxy.png" alt="Configure proxy 
options">
+### OTHER OPTIONS
 
-The second checkbox asks if your connection uses a proxy. In most cases, this 
is not necessary. You will usually know if you need to check this checkbox 
because the same settings will be used for other browsers on your system.
+The third checkbox asks if your connection uses a proxy. In most cases, this 
is not necessary. You will usually know if you need to select this checkbox 
because 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, click “Connect”.
+If your connection does not use a proxy, click "Connect".
+
+<img class="col-md-6" src="../../static/images/proxy.png" alt="Configure proxy 
options">



_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to