- tor-commits - lists.torproject.org

[manual/develop] sentence in one line
by gus＠torproject.org 08 May '20

08 May '20

commit e0f054451f80558688428b7c38986f9eb89526b3 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Apr 11 08:18:55 2020 +0200 sentence in one line --- content/bridges/contents.lr | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index 5b084cf..608fc29 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -29,9 +29,13 @@ 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"> -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. +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" 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. +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. ### ENTERING BRIDGE ADDRESSES @@ -39,8 +43,12 @@ Or, if you have Tor Browser running, click on "Preferences" in the hamburger men 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. 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 "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. 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 "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.

1 0

[manual/develop] Fix 'Mobile Tor' topic to all uppercase
by gus＠torproject.org 08 May '20

08 May '20

commit fd85819373596fb5fb3df8a25cc8567165921d6c Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Sat Apr 11 15:12:30 2020 +0000 Fix 'Mobile Tor' topic to all uppercase --- content/mobile-tor/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/mobile-tor/contents.lr b/content/mobile-tor/contents.lr index 78fcc07..852a0ed 100644 --- a/content/mobile-tor/contents.lr +++ b/content/mobile-tor/contents.lr @@ -1,6 +1,6 @@ _model: topic --- -title: Mobile Tor +title: MOBILE TOR --- description: Learn about Tor for mobile devices ---

1 0

[manual/develop] Add navbar-toggler-icon
by gus＠torproject.org 08 May '20

08 May '20

commit c965bc9f7c585c15da841730c884cf60a45cf9df Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Sat Apr 11 19:40:34 2020 +0000 Add navbar-toggler-icon --- templates/sidenav.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/sidenav.html b/templates/sidenav.html index 3a154a1..736c785 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -4,9 +4,8 @@ {{ _('Topics') }} </a> <label class="side-toggler" for="menu-toggle"> - <a class="btn btn-lg outline-primary text-primary navbar-toggler chevron" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> - <span class="oi oi-chevron-top chevron-up"></span> - <span class="oi oi-chevron-bottom chevron-down"></span> + <a class="btn btn-lg outline-primary text-primary navbar-toggler" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> </a> </label> <input type="checkbox" id="menu-toggle"/>

1 0

[manual/develop] fixed links, also one sentence per line
by gus＠torproject.org 08 May '20

08 May '20

commit b2ec64b43a3db1b66442033af148fdf44720267d Author: emma peel <emma.peel(a)riseup.net> Date: Sun Apr 12 08:35:41 2020 +0200 fixed links, also one sentence per line --- content/circumvention/contents.lr | 11 ++++++++--- content/mobile-tor/contents.lr | 8 ++++---- content/running-tor-browser/contents.lr | 4 +++- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/content/circumvention/contents.lr b/content/circumvention/contents.lr index f0d1cdf..e9bdc42 100644 --- a/content/circumvention/contents.lr +++ b/content/circumvention/contents.lr @@ -49,9 +49,14 @@ 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. 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. +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. +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. -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. 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 "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? @@ -62,4 +67,4 @@ If you are trying to circumvent a blocked connection for the first time, you sho If you try all of these options, and none of them gets you online, you will need to request a bridge or manually enter bridge addresses. -Read the [Bridges](/en-US/bridges/) section to learn what bridges are and how to obtain them. +Read the [Bridges](../bridges/) section to learn what bridges are and how to obtain them. diff --git a/content/mobile-tor/contents.lr b/content/mobile-tor/contents.lr index 3cd196b..4fd8704 100644 --- a/content/mobile-tor/contents.lr +++ b/content/mobile-tor/contents.lr @@ -68,7 +68,7 @@ When you run Tor Browser for the first time, you will see the option to connect In most cases, choosing "Connect" will allow you to connect to the Tor network without any further configuration. Once clicked, changing sentences will appear at the bottom of the screen, indicating Tor’s connection progress. -If you are on a relatively fast connection, but this text seems to get stuck at a certain point, see the [Troubleshooting](https://tb-manual.torproject.org/troubleshooting) page for help solving the problem. +If you are on a relatively fast connection, but this text seems to get stuck at a certain point, see the [Troubleshooting](../troubleshooting) page for help solving the problem. #### Configure @@ -78,7 +78,7 @@ If you know that your connection is censored, you should select the settings ico Tor Browser will take you through a series of configuration options. The first screen asks if access to the Tor network is blocked or censored on your connection. 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, click the switch. -You will then be taken to the [Circumvention](/mobile-tor/#circumvention) screen to configure a pluggable transport. +You will then be taken to the [Circumvention](../circumvention) screen to configure a pluggable transport. ### CIRCUMVENTION @@ -97,7 +97,7 @@ With the "Select a bridge" option, you will have two options: "obfs4" and "meek- <img style="max-width:300px" class="col-md-6" src="../../static/images/android-selected-a-bridge.png" alt="Selected a bridge on Tor Browser for Android"> -If you choose the "Provide a Bridge I know" option, then you have to enter a [bridge address](https://tb-manual.torproject.org/bridges/). +If you choose the "Provide a Bridge I know" option, then you have to enter a [bridge address](../bridges/). <img style="max-width:300px" class="col-md-6" src="../../static/images/android-provide-a-bridge.png" alt="Provide a bridge on Tor Browser for Android"> @@ -119,7 +119,7 @@ Selecting it will only change your Tor circuit. <img style="max-width:300px" class="col-md-6" src="../../static/images/android-security-settings.gif" alt="Security settings and security slider on Tor Browser for Android"> -[Security settings](https://tb-manual.torproject.org/security-settings/) disable certain web features that can be used to attack your security and anonymity. +[Security settings](../security-settings/) disable certain web features that can be used to attack your security and anonymity. Tor Browser for Android provides the same three security levels that are available on desktop. You can modify the security level by following given steps: diff --git a/content/running-tor-browser/contents.lr b/content/running-tor-browser/contents.lr index 960bc91..2de889c 100644 --- a/content/running-tor-browser/contents.lr +++ b/content/running-tor-browser/contents.lr @@ -40,4 +40,6 @@ This will display the [Circumvention](../circumvention) section to configure a p <img class="col-md-6" src="../../static/images/proxy.png"> -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. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click “Connect”. +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. +If possible, ask your network administrator for guidance. +If your connection does not use a proxy, click “Connect”.

1 0

[manual/develop] update menu items because otherwise no translation after the changes at ce046e8d. ref: https://gitlab.torproject.org/torproject/web/tpo/-/issues/5
by gus＠torproject.org 08 May '20

08 May '20

commit 9ebf6732a0c9bd43c49f2a39dd577574cf57a34e Author: emma peel <emma.peel(a)riseup.net> Date: Sat Apr 11 10:01:16 2020 +0200 update menu items because otherwise no translation after the changes at ce046e8d. ref: https://gitlab.torproject.org/torproject/web/tpo/-/issues/5 --- content/menu/contents.lr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/menu/contents.lr b/content/menu/contents.lr index ace6abd..91fac6a 100644 --- a/content/menu/contents.lr +++ b/content/menu/contents.lr @@ -19,11 +19,11 @@ Contact Jobs About Tor Browser Downloading -Running Tor Browser for the first time +Running Tor Browser for the First Time Pluggable transports Circumvention Bridges -Managing identities +Managing Identities Onion Services Secure Connections Security Settings @@ -34,6 +34,6 @@ Uninstalling Known issues Mobile Tor Becoming a Tor Translator -Making Tor Browser portable +Making Tor Browser Portable Installation

1 0

[manual/develop] sentence in one line
by gus＠torproject.org 08 May '20

08 May '20

commit 7990c16442df2af49d74235e6d15fd854f4ac5d9 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Apr 11 09:31:44 2020 +0200 sentence in one line --- content/mobile-tor/contents.lr | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/content/mobile-tor/contents.lr b/content/mobile-tor/contents.lr index 5bf7a50..3cd196b 100644 --- a/content/mobile-tor/contents.lr +++ b/content/mobile-tor/contents.lr @@ -60,8 +60,7 @@ You can also get Tor Browser for Android by downloading and installing the apk f ### RUNNING TOR BROWSER FOR ANDROID FOR THE FIRST TIME -When you run Tor Browser for the first time, you will see the option to connect directly to the Tor network, -or to configure Tor Browser for your connection with the settings icon. +When you run Tor Browser for the first time, you will see the option to connect directly to the Tor network, or to configure Tor Browser for your connection with the settings icon. #### Connect @@ -69,8 +68,7 @@ or to configure Tor Browser for your connection with the settings icon. In most cases, choosing "Connect" will allow you to connect to the Tor network without any further configuration. Once clicked, changing sentences will appear at the bottom of the screen, indicating Tor’s connection progress. -If you are on a relatively fast connection, but this text seems to get stuck at a certain point, -see the [Troubleshooting](https://tb-manual.torproject.org/troubleshooting) page for help solving the problem. +If you are on a relatively fast connection, but this text seems to get stuck at a certain point, see the [Troubleshooting](https://tb-manual.torproject.org/troubleshooting) page for help solving the problem. #### Configure @@ -79,8 +77,8 @@ see the [Troubleshooting](https://tb-manual.torproject.org/troubleshooting) page If you know that your connection is censored, you should select the settings icon. Tor Browser will take you through a series of configuration options. The first screen asks if access to the Tor network is blocked or censored on your connection. -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, -click the switch. You will then be taken to the [Circumvention](/mobile-tor/#circumvention) screen to configure a pluggable transport. +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, click the switch. +You will then be taken to the [Circumvention](/mobile-tor/#circumvention) screen to configure a pluggable transport. ### CIRCUMVENTION @@ -154,11 +152,11 @@ On the next screen, select Tor Browser and finally click on the "Update" button. #### Updating Tor Browser for Android manually -Visit the [Tor Project website](https://www.torproject.org/download/#android) and download a copy of the latest Tor Browser release, then [install](/mobile-tor/#downloading-and-installation) it as before. -In most cases, this latest version of Tor Browser will install over the older version, thereby upgrading the browser. -If doing this fails to update the browser, you may have to uninstall Tor Browser before reinstalling it. +Visit the [Tor Project website](https://www.torproject.org/download/#android) and download a copy of the latest Tor Browser release, then [install](/mobile-tor/#downloading-and-installation) it as before. +In most cases, this latest version of Tor Browser will install over the older version, thereby upgrading the browser. +If doing this fails to update the browser, you may have to uninstall Tor Browser before reinstalling it. With Tor Browser closed, remove it from your system by uninstalling it using your device's settings. -Depending on your mobile device's brand, navigate to Settings > Apps, then select Tor Browser and click on the "Uninstall" button. Afterwards,download the latest Tor Browser release and install it. +Depending on your mobile device's brand, navigate to Settings > Apps, then select Tor Browser and click on the "Uninstall" button. Afterwards,download the latest Tor Browser release and install it. ### UNINSTALLING @@ -215,8 +213,7 @@ Check out [our Support portal](https://support.torproject.org/tormobile/tormobil ### Tor Browser for iOS There is no Tor Browser for iOS. We recommend an iOS app called Onion Browser, which is open source, uses Tor routing, and is developed by someone who works closely with the Tor Project. -However, Apple requires browsers on iOS to use something called Webkit, which prevents Onion Browser -from having the same privacy protections as Tor Browser. +However, Apple requires browsers on iOS to use something called Webkit, which prevents Onion Browser from having the same privacy protections as Tor Browser. [Learn more about Onion Browser](https://blog.torproject.org/tor-heart-onion-browser-and-more-ios-t…. Download Onion Browser from the [App Store](https://itunes.apple.com/us/app/onion-browser/id519296448). @@ -224,4 +221,3 @@ Download Onion Browser from the [App Store](https://itunes.apple.com/us/app/onio ### Tor Browser for Windows Phone There is currently no supported method for running Tor on Windows Phone. -

1 0

[manual/develop] Add conditional to test if not on homepage
by gus＠torproject.org 08 May '20

08 May '20

commit 36f646cf559b9d7392a8ad367c720b22ce563ac3 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Sat Apr 18 19:59:45 2020 +0000 Add conditional to test if not on homepage --- templates/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/layout.html b/templates/layout.html index 5b75755..e58e0a8 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -21,7 +21,7 @@ </div> <div class="container-fluid"> <div class="row flex-xl-nowrap"> - {% include 'sidenav.html' %} + {% if this.title != "Tor Browser User Manual" %} {% include 'sidenav.html' %} {% endif %} <main role="main" class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> {% block body %}{% endblock %} </main>

1 0

[manual/develop] Merge branch 'mobile-tor-topic-not-uppercase#32'
by gus＠torproject.org 08 May '20

08 May '20

commit f9eb24be503a5034cd89eb188c7647c4fa3f70be Merge: b2ec64b fd85819 Author: gus <gus(a)torproject.org> Date: Mon Apr 13 14:30:50 2020 -0400 Merge branch 'mobile-tor-topic-not-uppercase#32' content/mobile-tor/contents.lr | 2 +- databags/topics.ini | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[manual/develop] Merge branch 'add-navbar-toggler-icon'
by gus＠torproject.org 08 May '20

08 May '20

commit d6ca84908975a29d19b6ee290ca56bc24d48cad7 Merge: 7d9f1ca 36d7c08 Author: gus <gus(a)torproject.org> Date: Mon Apr 20 21:56:48 2020 -0400 Merge branch 'add-navbar-toggler-icon' templates/sidenav.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

1 0

[manual/develop] Remove eoy.css link
by gus＠torproject.org 08 May '20

08 May '20

commit 7d9f1cae7c50e51f596508e39495fbc23175bed0 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Sun Apr 12 17:19:58 2020 +0000 Remove eoy.css link --- templates/layout.html | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/layout.html b/templates/layout.html index c5929cc..5b75755 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -4,7 +4,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/css/eoy.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet">

1 0