Commit 109ede9b authored by Gus's avatar Gus 🍕
Browse files

Merge branch 'update-tb-105' into develop

parents 78289a27 03e7bce2
Pipeline #9108 passed with stage
in 2 minutes and 11 seconds
assets/static/images/configure.png

19.1 KB | W: | H:

assets/static/images/configure.png

236 KB | W: | H:

assets/static/images/configure.png
assets/static/images/configure.png
assets/static/images/configure.png
assets/static/images/configure.png
  • 2-up
  • Swipe
  • Onion skin
assets/static/images/connect.png

19.1 KB | W: | H:

assets/static/images/connect.png

238 KB | W: | H:

assets/static/images/connect.png
assets/static/images/connect.png
assets/static/images/connect.png
assets/static/images/connect.png
  • 2-up
  • Swipe
  • Onion skin
assets/static/images/proxy.png

17.6 KB | W: | H:

assets/static/images/proxy.png

264 KB | W: | H:

assets/static/images/proxy.png
assets/static/images/proxy.png
assets/static/images/proxy.png
assets/static/images/proxy.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -29,26 +29,24 @@ Because bridge addresses are not public, you will need to request them yourself.
<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 "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.
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.
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, 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.
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.
### 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" (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, check the checkbox "Use a bridge," and from the option "Provide a bridge I know," enter each bridge address on a separate line.
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.
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.
......@@ -49,13 +49,13 @@ 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" (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, 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.
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.
......
......@@ -11,7 +11,8 @@ 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.
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
......@@ -23,9 +24,9 @@ If you are on a relatively fast connection, but this bar seems to get stuck at a
### CONFIGURE
<img class="col-md-6" src="../../static/images/configure.png" alt="Click 'configure' to adjust network settings.">
<img class="col-md-6" src="../../static/images/configure.png" alt="Click 'Tor Network Settings' to adjust network settings.">
If you know that your connection is censored or uses a proxy, you should select this option.
If you know that your connection is censored or uses a proxy, you should select "Tor Network Settings".
<img class="col-md-6" src="../../static/images/proxy_question.png" alt="Select options for censored connection or proxy use.">
......@@ -33,13 +34,12 @@ Tor Browser will take you through a series of configuration options.
<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.
The first checkbox is Quickstart. Every time you open Tor Browser, it will try to connect with your previous network settings.
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, check the checkbox.
This will display the [Circumvention](../circumvention) section to configure a pluggable transport.
<img class="col-md-6" src="../../static/images/proxy.png" alt="Configure proxy 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 check 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”.
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment