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

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 24 Mar '21

24 Mar '21

commit 44df63e591feec5d5ae5c4a838664997bc64f489 Merge: a93f736337 9ca2394d6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 24 12:25:05 2021 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40345 | 5 +++++ src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.5] channel: Fix use after free in channel_do_open_actions()
by nickm＠torproject.org 24 Mar '21

24 Mar '21

commit 9ca2394d6b51242bb5cf380757be5869d2a44c3c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Mar 23 09:19:41 2021 -0400 channel: Fix use after free in channel_do_open_actions() Fortunately, our tor_free() is setting the variable to NULL after so we were in a situation where NULL was always used instead of the transport name. This first appeared in 894ff2dc8422cb86312c512698acd76476224f87 and results in basically no bridge with a transport being able to use DoS defenses. Fixes #40345 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40345 | 5 +++++ src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/ticket40345 b/changes/ticket40345 new file mode 100644 index 0000000000..246e4a86af --- /dev/null +++ b/changes/ticket40345 @@ -0,0 +1,5 @@ + o Minor bugfixes (channel, DoS): + - Fix a possible non fatal assertion BUG() due to a too early free of a + string when noting down the client connection for the DoS defenses + subsystem. Fixes bug 40345; bugfix on 0.4.3.4-rc + diff --git a/src/core/or/channel.c b/src/core/or/channel.c index 9194718e3d..50c03de846 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -1887,11 +1887,11 @@ channel_do_open_actions(channel_t *chan) geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &remote_addr, transport_name, now); - tor_free(transport_name); /* Notify the DoS subsystem of a new client. */ if (tlschan && tlschan->conn) { dos_new_client_conn(tlschan->conn, transport_name); } + tor_free(transport_name); } /* Otherwise the underlying transport can't tell us this, so skip it */ }

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 24 Mar '21

24 Mar '21

commit c40b729c85ff45501523cbcd37f603aceeea4774 Merge: ea781dc44f c359c3056b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 24 12:25:05 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40345 | 5 +++++ src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] channel: Fix use after free in channel_do_open_actions()
by nickm＠torproject.org 24 Mar '21

24 Mar '21

commit 9ca2394d6b51242bb5cf380757be5869d2a44c3c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Mar 23 09:19:41 2021 -0400 channel: Fix use after free in channel_do_open_actions() Fortunately, our tor_free() is setting the variable to NULL after so we were in a situation where NULL was always used instead of the transport name. This first appeared in 894ff2dc8422cb86312c512698acd76476224f87 and results in basically no bridge with a transport being able to use DoS defenses. Fixes #40345 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40345 | 5 +++++ src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/ticket40345 b/changes/ticket40345 new file mode 100644 index 0000000000..246e4a86af --- /dev/null +++ b/changes/ticket40345 @@ -0,0 +1,5 @@ + o Minor bugfixes (channel, DoS): + - Fix a possible non fatal assertion BUG() due to a too early free of a + string when noting down the client connection for the DoS defenses + subsystem. Fixes bug 40345; bugfix on 0.4.3.4-rc + diff --git a/src/core/or/channel.c b/src/core/or/channel.c index 9194718e3d..50c03de846 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -1887,11 +1887,11 @@ channel_do_open_actions(channel_t *chan) geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &remote_addr, transport_name, now); - tor_free(transport_name); /* Notify the DoS subsystem of a new client. */ if (tlschan && tlschan->conn) { dos_new_client_conn(tlschan->conn, transport_name); } + tor_free(transport_name); } /* Otherwise the underlying transport can't tell us this, so skip it */ }

1 0

[tor/maint-0.4.5] channel: Fix use after free in channel_do_open_actions()
by nickm＠torproject.org 24 Mar '21

24 Mar '21

commit 9ca2394d6b51242bb5cf380757be5869d2a44c3c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Mar 23 09:19:41 2021 -0400 channel: Fix use after free in channel_do_open_actions() Fortunately, our tor_free() is setting the variable to NULL after so we were in a situation where NULL was always used instead of the transport name. This first appeared in 894ff2dc8422cb86312c512698acd76476224f87 and results in basically no bridge with a transport being able to use DoS defenses. Fixes #40345 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40345 | 5 +++++ src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/ticket40345 b/changes/ticket40345 new file mode 100644 index 0000000000..246e4a86af --- /dev/null +++ b/changes/ticket40345 @@ -0,0 +1,5 @@ + o Minor bugfixes (channel, DoS): + - Fix a possible non fatal assertion BUG() due to a too early free of a + string when noting down the client connection for the DoS defenses + subsystem. Fixes bug 40345; bugfix on 0.4.3.4-rc + diff --git a/src/core/or/channel.c b/src/core/or/channel.c index 9194718e3d..50c03de846 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -1887,11 +1887,11 @@ channel_do_open_actions(channel_t *chan) geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &remote_addr, transport_name, now); - tor_free(transport_name); /* Notify the DoS subsystem of a new client. */ if (tlschan && tlschan->conn) { dos_new_client_conn(tlschan->conn, transport_name); } + tor_free(transport_name); } /* Otherwise the underlying transport can't tell us this, so skip it */ }

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5
by nickm＠torproject.org 24 Mar '21

24 Mar '21

commit c359c3056b2dbf17987a8955af30884ee438108e Merge: 59bbf8cde9 9ca2394d6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 24 12:25:05 2021 -0400 Merge branch 'maint-0.4.4' into maint-0.4.5 changes/ticket40345 | 5 +++++ src/core/or/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/339'
by nickm＠torproject.org 24 Mar '21

24 Mar '21

commit 37b16d7e1977647d297c165afa0435536a474264 Merge: f1c673fa54 6de09642f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 24 12:23:30 2021 -0400 Merge remote-tracking branch 'tor-gitlab/mr/339' changes/ticket40271 | 5 +++++ src/core/or/connection_edge.c | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+)

1 0

[tor/master] warn and reject reentering streams at client too
by nickm＠torproject.org 24 Mar '21

24 Mar '21

commit 6de09642f06b8ee0da3e47e17b350aea6c7644a9 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 1 21:43:41 2021 -0500 warn and reject reentering streams at client too Clients now check whether their streams are attempting to re-enter the Tor network (i.e. to send Tor traffic over Tor), and they close them preemptively if they think exit relays will refuse them. See bug 2667 for details. Resolves ticket 40271. --- changes/ticket40271 | 5 +++++ src/core/or/connection_edge.c | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/changes/ticket40271 b/changes/ticket40271 new file mode 100644 index 0000000000..a977be75e1 --- /dev/null +++ b/changes/ticket40271 @@ -0,0 +1,5 @@ + o Minor features (client): + - Clients now check whether their streams are attempting to re-enter + the Tor network (i.e. to send Tor traffic over Tor), and they close + them preemptively if they think exit relays will refuse them. See + ticket 2667 for details. Close ticket 40271. diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index 7e0f51428a..b89f3336dc 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -163,6 +163,7 @@ static int connection_ap_process_natd(entry_connection_t *conn); static int connection_exit_connect_dir(edge_connection_t *exitconn); static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port); static int connection_ap_supports_optimistic_data(const entry_connection_t *); +static bool network_reentry_is_allowed(void); /** * Cast a `connection_t *` to an `edge_connection_t *`. @@ -2401,6 +2402,25 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, * address. */ conn->entry_cfg.ipv6_traffic = 0; } + + /* Next, yet another check: we know it's a direct IP address. Is it + * the IP address of a known relay and its ORPort, or of a directory + * authority and its OR or Dir Port? If so, and if a consensus param + * says to, then exit relays will refuse this request (see ticket + * 2667 for details). Let's just refuse it locally right now, to + * save time and network load but also to give the user a more + * useful log message. */ + if (!network_reentry_is_allowed() && + nodelist_reentry_contains(&addr, socks->port)) { + log_warn(LD_APP, "Not attempting connection to %s:%d because " + "the network would reject it. Are you trying to send " + "Tor traffic over Tor? This traffic can be harmful to " + "the Tor network. If you really need it, try using " + "a bridge as a workaround.", + safe_str_client(socks->address), socks->port); + connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); + return -1; + } } }

1 0

[Git][tpo/applications/fenix][tor-browser-87.0.0b2-10.5-1] Revert "Bug 40138: Add feedback survey card"
by Matthew Finkel 24 Mar '21

24 Mar '21

Matthew Finkel pushed to branch tor-browser-87.0.0b2-10.5-1 at The Tor Project / Applications / fenix Commits: 0f333548 by Matthew Finkel at 2021-03-23T21:39:10+00:00 Revert "Bug 40138: Add feedback survey card" This reverts commit 706838904ea883f56095d77f9dd484ab61f6480e. Bug 40151: Remove survey banner on TBA-stable - - - - - 11 changed files: - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt - − app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorFeedbackSurveyViewHolder.kt - app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt - − app/src/main/res/drawable/feedback_survey_padded_background.xml - − app/src/main/res/drawable/tor_survey_icon_3x.png - app/src/main/res/layout/fragment_home.xml - − app/src/main/res/layout/tor_feedback_survey.xml - app/src/main/res/values/colors.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt ===================================== @@ -23,7 +23,6 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.NoCollectionsMessageViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.PrivateBrowsingDescriptionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapPagerViewHolder -import org.mozilla.fenix.home.sessioncontrol.viewholders.TorFeedbackSurveyViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TabInCollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TopSitePagerViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.OnboardingAutomaticSignInViewHolder @@ -81,7 +80,6 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) { } object PrivateBrowsingDescription : AdapterItem(PrivateBrowsingDescriptionViewHolder.LAYOUT_ID) - object TorFeedbackSurvey : AdapterItem(TorFeedbackSurveyViewHolder.LAYOUT_ID) object NoCollectionsMessage : AdapterItem(NoCollectionsMessageViewHolder.LAYOUT_ID) object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID) @@ -181,10 +179,6 @@ class SessionControlAdapter( view, interactor ) - TorFeedbackSurveyViewHolder.LAYOUT_ID -> TorFeedbackSurveyViewHolder( - view, - interactor - ) TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder( view, components, ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt ===================================== @@ -92,11 +92,6 @@ interface SessionControlController { */ fun handlePrivateBrowsingLearnMoreClicked() - /** - * @see [TabSessionInteractor.onTorFeedbackSurveyLaunchClicked] - */ - fun handleTorFeedbackSurveyLaunchClicked() - /** * @see [TopSiteInteractor.onRenameTopSiteClicked] */ @@ -625,12 +620,4 @@ class DefaultSessionControlController( override fun handleTorNetworkSettingsClicked() { openTorNetworkSettings() } - - override fun handleTorFeedbackSurveyLaunchClicked() { - activity.openToBrowserAndLoad( - searchTermOrURL = SupportUtils.TOR_FEEDBACK_SURVEY_URL, - newTab = true, - from = BrowserDirection.FromHome - ) - } } ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt ===================================== @@ -18,12 +18,6 @@ interface TabSessionInteractor { * "Common myths about private browsing" link in private mode. */ fun onPrivateBrowsingLearnMoreClicked() - - /** - * Shows the Feedback Survey web page in a new tab. Called when a user clicks on the - * "Launch the Survey" button. - */ - fun onTorFeedbackSurveyLaunchClicked() } /** @@ -367,8 +361,4 @@ class SessionControlInteractor( override fun onTorBootstrapNetworkSettingsClicked() { controller.handleTorNetworkSettingsClicked() } - - override fun onTorFeedbackSurveyLaunchClicked() { - controller.handleTorFeedbackSurveyLaunchClicked() - } } ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt ===================================== @@ -66,7 +66,7 @@ private fun showCollections( } } -private fun privateModeAdapterItems() = listOf(AdapterItem.TorFeedbackSurvey) +private fun privateModeAdapterItems() = listOf(AdapterItem.PrivateBrowsingDescription) private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap) ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorFeedbackSurveyViewHolder.kt deleted ===================================== @@ -1,34 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.home.sessioncontrol.viewholders - -import android.view.View -import androidx.recyclerview.widget.RecyclerView -import kotlinx.android.synthetic.main.tor_feedback_survey.view.* -import org.mozilla.fenix.R -import org.mozilla.fenix.home.sessioncontrol.TabSessionInteractor - -class TorFeedbackSurveyViewHolder( - view: View, - private val interactor: TabSessionInteractor -) : RecyclerView.ViewHolder(view) { - - init { - // val resources = view.resources - // val appName = resources.getString(R.string.app_name) - // view.private_session_description.text = resources.getString( - // R.string.private_browsing_placeholder_description_2, appName - // ) - with(view.feedback_survey_launch_button) { - setOnClickListener { - interactor.onTorFeedbackSurveyLaunchClicked() - } - } - } - - companion object { - const val LAYOUT_ID = R.layout.tor_feedback_survey - } -} ===================================== app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt ===================================== @@ -37,7 +37,6 @@ object SupportUtils { const val DONATE_URL = "https://donate.torproject.org/" const val TB_MANUAL_URL = "https://tb-manual.torproject.org/mobile-tor" const val TOR_RELEASES = "https://www.torproject.org/releases/" - const val TOR_FEEDBACK_SURVEY_URL = "http://bogdyardcfurxcle.onion/index.php/491436" enum class SumoTopic(internal val topicStr: String) { FENIX_MOVING("sync-delist"), ===================================== app/src/main/res/drawable/feedback_survey_padded_background.xml deleted ===================================== @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@color/feedback_survey_padded_background_color"> - <item - android:bottom="6dp" - android:top="6dp"> - <shape android:shape="rectangle"> - <corners android:radius="4dp" /> - </shape> - </item> -</ripple> ===================================== app/src/main/res/drawable/tor_survey_icon_3x.png deleted ===================================== Binary files a/app/src/main/res/drawable/tor_survey_icon_3x.png and /dev/null differ ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -94,8 +94,7 @@ android:textColor="#DEFFFFFF" android:textSize="40sp" android:lineSpacingMultiplier="1.1" - app:layout_scrollFlags="scroll" - android:visibility="gone" /> + app:layout_scrollFlags="scroll" /> </com.google.android.material.appbar.AppBarLayout> ===================================== app/src/main/res/layout/tor_feedback_survey.xml deleted ===================================== @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/feedback_survey_wrapper" - style="@style/OnboardingCardLightWithPadding" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clipChildren="false" - android:clipToPadding="false"> - - <LinearLayout - android:id="@+id/feedback_survey_header_wrapper" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - android:importantForAccessibility="no"> - - <ImageView - android:id="@+id/tor_feedback_icon" - android:layout_width="wrap_content" - android:layout_height="32dp" - android:layout_marginEnd="10dp" - android:adjustViewBounds="true" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - app:srcCompat="@drawable/tor_survey_icon_3x"/> - - <TextView - android:id="@+id/feedback_survey_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="none" - android:lineSpacingExtra="6dp" - android:paddingHorizontal="4dp" - android:paddingTop="4dp" - android:scrollHorizontally="false" - android:textAlignment="viewStart" - android:textColor="?primaryText" - android:textSize="20sp" - android:text="Do you use Snowflake?" /> - </LinearLayout> - - <TextView - android:id="@+id/feedback_survey_description" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="none" - android:lineSpacingExtra="6dp" - android:paddingHorizontal="4dp" - android:paddingTop="4dp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/feedback_survey_header_wrapper" - android:scrollHorizontally="false" - android:textAlignment="viewStart" - android:textColor="?primaryText" - android:textSize="16sp" - android:text="Snowflake is a pluggable transport available in Tor Browser. Help us improve it by completing this short survey about your browsing experience:" /> - - <Button - style="@style/PositiveButton" - android:id="@+id/feedback_survey_launch_button" - android:text="Launch the Survey" - android:layout_marginTop="16dp" - android:textSize="18dp" - android:textColor="@android:color/black" - android:background="@drawable/feedback_survey_padded_background" - android:fontFamily="Roboto-Medium" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/feedback_survey_description" /> - -</androidx.constraintlayout.widget.ConstraintLayout> ===================================== app/src/main/res/values/colors.xml ===================================== @@ -425,7 +425,4 @@  <color name="toolbar_menu_transparent">@android:color/transparent</color> - -  - <color name="feedback_survey_padded_background_color">#A76FFA</color> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/0f3335483d3e8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/0f3335483d3e8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 24 Mar '21

24 Mar '21

commit 51e14176b68be0f7ab67f4ad39a18556f61ffc1e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 24 16:15:12 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+fr.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 0dd9853ba8..589fd7eeb2 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -8,13 +8,13 @@ # Silvio Fachinotti, 2020 # Cor l3ss <corl3ss(a)corl3ss.com>, 2020 # Mehdi Djazzi <contact(a)mehdidjazzi.com>, 2021 -# AO <ao(a)localizationlab.org>, 2021 # erinm, 2021 # Gus, 2021 # Emma Peel, 2021 # Vincent Breitmoser <look(a)my.amazin.horse>, 2021 # Transifex Bot <>, 2021 # Emeric Vallespi <evallespi(a)protonmail.com>, 2021 +# AO <ao(a)localizationlab.org>, 2021 # msgid "" msgstr "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-18 19:45+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Emeric Vallespi <evallespi(a)protonmail.com>, 2021\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2021\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17144,18 +17144,18 @@ msgid "" "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." msgstr "" -"Cliquez sur le bouton « Tor » pour voir quelles données les observateurs " -"peuvent voir quand vous utilisez Tor. Le bouton deviendra vert pour indiquer" -" que Tor est activé." +"Cliquez sur le bouton « Tor » pour afficher quelles données les observateurs" +" peuvent voir quand vous utilisez Tor. Le bouton deviendra vert pour " +"indiquer que Tor est activé." #: lego/templates/secure-connections.html:5 msgid "" "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." msgstr "" -"Cliquez sur le bouton « HTTPS » pour voir quelles données les observateurs " -"peuvent voir quand vous utilisez HTTPS. Le bouton deviendra vert pour " -"indiquer que HTTPS est activé." +"Cliquez sur le bouton « HTTPS » pour afficher quelles données les " +"observateurs peuvent voir quand vous utilisez HTTPS. Le bouton deviendra " +"vert pour indiquer que HTTPS est activé." #: lego/templates/secure-connections.html:6 msgid "" @@ -17196,7 +17196,7 @@ msgstr "Le site que vous visitez." #: lego/templates/secure-connections.html:44 msgid "user / pw" -msgstr "utilisat./mdp" +msgstr "utilisateur/mdp" #: lego/templates/secure-connections.html:47 msgid "Username and password used for authentication."

1 0