July 2021 - tor-commits - lists.torproject.org

[Git][tpo/applications/fenix][tor-browser-90.0.0b6-11.0-1] 3 commits: Bug 40177: Hide Tor icons in settings
by Matthew Finkel (＠sysrqb) 09 Jul '21

09 Jul '21

Matthew Finkel pushed to branch tor-browser-90.0.0b6-11.0-1 at The Tor Project / Applications / fenix Commits: f5382431 by HackerNCoder at 2021-07-07T21:26:00+00:00 Bug 40177: Hide Tor icons in settings - - - - - a5664eed by HackerNCoder at 2021-07-08T20:25:25+00:00 fixup! Bug 40177: Hide Tor icons in settings - - - - - 322cd5aa by Matthew Finkel at 2021-07-09T17:53:12+00:00 Merge remote-tracking branch 'hackerncodergl/bug_40177' into tor-browser-90.0.0b6-11.0-1 - - - - - 1 changed file: - app/src/main/res/xml/preferences.xml Changes: ===================================== app/src/main/res/xml/preferences.xml ===================================== @@ -97,8 +97,9 @@ android:title="@string/preferences_category_privacy_security" android:layout="@layout/preference_category_no_icon_style"> +  <androidx.preference.Preference - android:icon="@drawable/ic_tracking_protection_enabled" + app:iconSpaceReserved="false" android:key="@string/pref_key_tor_security_level_settings" android:title="@string/preferences_tor_security_level_settings" /> @@ -108,8 +109,9 @@ app:isPreferenceVisible="false" android:title="@string/preferences_private_browsing_options" /> +  <androidx.preference.Preference - android:icon="@drawable/ic_tor_network_settings" + app:iconSpaceReserved="false" android:key="@string/pref_key_tor_network_settings" android:title="@string/preferences_tor_network_settings" /> @@ -152,8 +154,9 @@ android:key="@string/pref_key_advanced" android:layout="@layout/preference_category_no_icon_style"> +  <SwitchPreference - android:icon="@drawable/ic_screenshot" + app:iconSpaceReserved="false" android:key="@string/pref_key_allow_screenshots_in_private_mode" android:title="@string/preferences_allow_screenshots" /> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/16dc16f51280… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/16dc16f51280… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-78.11.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 09 Jul '21

09 Jul '21

commit f5dbe466cd7e3a37318fd4e68e93599b5bd35b23 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jul 9 12:10:31 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/BrowserGlue.jsm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 914b782afdb1..8735783cee2b 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -17,11 +17,28 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -const { TorProtocolService } = ChromeUtils.import( +// TorProtocolService and TorConnect modules need to be lazily-loaded +// here because they will trigger generation of the random password used +// to talk to the tor daemon in tor-launcher. Generating the random +// password will initialize the cryptographic service ( nsNSSComponent ) +// +// If this service is init'd before the profile has been setup, it will +// use the fallback init path which behaves as if security.nocertdb=true +// +// We make these module getters so init happens when they are needed +// (when init'ing the OnionAliasStore). With theze getters, the password +// generation is triggered in torbutton after the 'profile-after-change' +// topic (so after the profile is initialized) + +ChromeUtils.defineModuleGetter( + this, + "TorProtocolService", "resource:///modules/TorProtocolService.jsm" ); -const { TorConnect } = ChromeUtils.import( +ChromeUtils.defineModuleGetter( + this, + "TorConnect", "resource:///modules/TorConnect.jsm" );

1 0

[manual/develop] Tor Browser launcher removal
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 03e7bce2231efcf529a34dfa7a412fabd3aea406 Author: kulsoomzahra <kulsoomzahra24(a)gmail.com> Date: Wed Jul 7 11:46:35 2021 +0530 Tor Browser launcher removal --- assets/static/images/configure.png | Bin 19559 -> 242075 bytes assets/static/images/connect.png | Bin 19565 -> 244088 bytes assets/static/images/pluggable-transport.png | Bin 17010 -> 288263 bytes assets/static/images/proxy.png | Bin 17987 -> 270622 bytes assets/static/images/proxy_question.png | Bin 9105 -> 0 bytes assets/static/images/request-a-bridge.png | Bin 17195 -> 320144 bytes .../static/images/tor-launcher-custom-bridges.png | Bin 19072 -> 329884 bytes content/bridges/contents.lr | 14 ++++++-------- content/circumvention/contents.lr | 8 ++++---- content/running-tor-browser/contents.lr | 16 ++++++++-------- 10 files changed, 18 insertions(+), 20 deletions(-) diff --git a/assets/static/images/configure.png b/assets/static/images/configure.png index f29b8b9..53a108c 100644 Binary files a/assets/static/images/configure.png and b/assets/static/images/configure.png differ diff --git a/assets/static/images/connect.png b/assets/static/images/connect.png index a93939c..2db3f93 100644 Binary files a/assets/static/images/connect.png and b/assets/static/images/connect.png differ diff --git a/assets/static/images/pluggable-transport.png b/assets/static/images/pluggable-transport.png index ff44ba8..0cb2cbf 100644 Binary files a/assets/static/images/pluggable-transport.png and b/assets/static/images/pluggable-transport.png differ diff --git a/assets/static/images/proxy.png b/assets/static/images/proxy.png index 9e234c7..f905dbb 100644 Binary files a/assets/static/images/proxy.png and b/assets/static/images/proxy.png differ diff --git a/assets/static/images/proxy_question.png b/assets/static/images/proxy_question.png deleted file mode 100644 index ec45f1c..0000000 Binary files a/assets/static/images/proxy_question.png and /dev/null differ diff --git a/assets/static/images/request-a-bridge.png b/assets/static/images/request-a-bridge.png index 21bcd53..dc4728b 100644 Binary files a/assets/static/images/request-a-bridge.png and b/assets/static/images/request-a-bridge.png differ diff --git a/assets/static/images/tor-launcher-custom-bridges.png b/assets/static/images/tor-launcher-custom-bridges.png index f1ef64b..354665f 100644 Binary files a/assets/static/images/tor-launcher-custom-bridges.png and b/assets/static/images/tor-launcher-custom-bridges.png differ diff --git a/content/bridges/contents.lr b/content/bridges/contents.lr index 92ab4ab..45235f5 100644 --- a/content/bridges/contents.lr +++ b/content/bridges/contents.lr @@ -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. diff --git a/content/circumvention/contents.lr b/content/circumvention/contents.lr index d3245e8..84a9d00 100644 --- a/content/circumvention/contents.lr +++ b/content/circumvention/contents.lr @@ -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. diff --git a/content/running-tor-browser/contents.lr b/content/running-tor-browser/contents.lr index 708d277..cdf167b 100644 --- a/content/running-tor-browser/contents.lr +++ b/content/running-tor-browser/contents.lr @@ -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

1 0

[manual/develop] Merge branch 'update-tb-105' into develop
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 109ede9b6ca412f6b4ba5f29c10f4a2793f2bba9 Merge: 78289a2 03e7bce Author: gus <gus(a)torproject.org> Date: Fri Jul 9 14:09:34 2021 -0300 Merge branch 'update-tb-105' into develop assets/static/images/configure.png | Bin 19559 -> 242075 bytes assets/static/images/connect.png | Bin 19565 -> 244088 bytes assets/static/images/pluggable-transport.png | Bin 17010 -> 288263 bytes assets/static/images/proxy.png | Bin 17987 -> 270622 bytes assets/static/images/proxy_question.png | Bin 9105 -> 0 bytes assets/static/images/request-a-bridge.png | Bin 17195 -> 320144 bytes .../static/images/tor-launcher-custom-bridges.png | Bin 19072 -> 329884 bytes content/bridges/contents.lr | 14 ++++++-------- content/circumvention/contents.lr | 8 ++++---- content/running-tor-browser/contents.lr | 16 ++++++++-------- 10 files changed, 18 insertions(+), 20 deletions(-)

1 0

[tor-browser-build/master] Bug 40337: Refresh Mozilla's PGP signing key
by sysrqb＠torproject.org 09 Jul '21

09 Jul '21

commit 37a580414f5747cd8255f8a18d284162b6eddb44 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jul 9 14:33:20 2021 +0000 Bug 40337: Refresh Mozilla's PGP signing key --- keyring/firefox.gpg | Bin 2817 -> 7897 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/firefox.gpg b/keyring/firefox.gpg index d2eada0..2c9c57f 100644 Binary files a/keyring/firefox.gpg and b/keyring/firefox.gpg differ

1 0

[manual/develop] Merge branch 'client-auth-mobile'
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit f92e5e565dbbc8d9c1447118c5b6a5994bc66bee Merge: bfc5679 cef7a48 Author: gus <gus(a)torproject.org> Date: Mon Jun 28 16:17:23 2021 -0300 Merge branch 'client-auth-mobile' content/mobile-tor/contents.lr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[manual/develop] onion service page mention about v2 deprecation on troubleshooting and remove it from the main part
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 28cf02d8524357a0b6fcf451aece450a9db7953d Author: nyxnor <nyxnor(a)protonmail.com> Date: Fri Jul 2 00:36:58 2021 +0000 onion service page mention about v2 deprecation on troubleshooting and remove it from the main part --- content/onion-services/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr index 8334f0c..67e7b6a 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. @@ -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. +If they 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](http://3g2upl4pq6kufc4m.onion/).

1 0

[manual/develop] Merge branch 'onion-services-page'
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 93bbb67af7c943d71483f62c3d80fe892d0309f8 Merge: f92e5e5 9b04d78 Author: gus <gus(a)torproject.org> Date: Thu Jul 8 11:20:27 2021 -0300 Merge branch 'onion-services-page' content/onion-services/contents.lr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[manual/develop] Merge branch 'master' into develop
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 78289a2724445b2afeea0cd11e94adf9d1c7adf2 Merge: e13c394 93bbb67 Author: gus <gus(a)torproject.org> Date: Fri Jul 9 14:07:15 2021 -0300 Merge branch 'master' into develop .gitlab-ci.yml | 62 +++++++++++++++++ .htaccess | 8 +-- README.md | 17 +++-- assets/static/images/android-censored.png | Bin 74940 -> 177136 bytes assets/static/images/android-configure.png | Bin 69892 -> 237088 bytes assets/static/images/android-connect.png | Bin 69965 -> 239210 bytes assets/static/images/android-new-identity.png | Bin 105151 -> 263142 bytes assets/static/images/android-provide-a-bridge.png | Bin 109572 -> 159176 bytes assets/static/images/android-provided-a-bridge.png | Bin 98794 -> 142112 bytes assets/static/images/android-security-settings.gif | Bin 1345090 -> 714378 bytes assets/static/images/android-select-a-bridge.png | Bin 109560 -> 150983 bytes assets/static/images/android-selected-a-bridge.png | Bin 124065 -> 162159 bytes assets/static/images/circuit_full.png | Bin 39012 -> 51207 bytes assets/static/images/client-auth.png | Bin 0 -> 27810 bytes assets/static/images/favicon.ico | Bin 0 -> 4286 bytes assets/static/images/favicon.png | Bin 0 -> 1184 bytes assets/static/images/new_identity.png | Bin 59280 -> 100975 bytes assets/static/images/onion-location.png | Bin 0 -> 11867 bytes assets/static/images/security-settings-anim.gif | Bin 1119741 -> 592873 bytes assets/static/images/security-settings-safest.png | Bin 136500 -> 78518 bytes content/bridges/contents.lr | 18 ++--- content/circumvention/contents.lr | 4 +- content/downloading/contents.lr | 8 +-- content/installation/contents.lr | 16 +++-- content/known-issues/contents.lr | 27 +++++--- content/managing-identities/contents.lr | 4 +- content/menu/contents.lr | 2 +- content/mobile-tor/contents.lr | 75 ++++++++++----------- content/onion-services/contents.lr | 56 +++++++++++++-- content/plugins/contents.lr | 2 +- content/running-tor-browser/contents.lr | 10 +-- content/security-settings/contents.lr | 6 +- content/troubleshooting/contents.lr | 41 +++++++++-- content/updating/contents.lr | 6 +- databags/alternatives.ini | 12 ---- databags/topics.ini | 4 -- lego | 2 +- manual.lektorproject | 29 ++++---- templates/layout.html | 4 ++ templates/macros/topic.html | 2 +- templates/sidenav.html | 2 +- 41 files changed, 274 insertions(+), 143 deletions(-)

1 0

[manual/develop] s/they/the
by gus＠torproject.org 09 Jul '21

09 Jul '21

commit 9b04d787aa8a9e865d00234169c0992900e3cfae Author: nyxnor <nyxnor(a)protonmail.com> Date: Fri Jul 2 13:13:27 2021 +0000 s/they/the --- content/onion-services/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr index 67e7b6a..79bce87 100644 --- a/content/onion-services/contents.lr +++ b/content/onion-services/contents.lr @@ -70,6 +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. -If they 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/). +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](http://3g2upl4pq6kufc4m.onion/).

1 0