April 2020 - tor-commits - lists.torproject.org

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit fd5195fbf779c0a79e3fb4648cd3525dc7a7ef10 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 17:47:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fa.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fa.po b/fa.po index 46177d2546..9517a4215c 100644 --- a/fa.po +++ b/fa.po @@ -27,7 +27,7 @@ # Mohammad Hadi K <mhkaramzadeh7(a)gmail.com>, 2018 # Mohammad Hossein <desmati(a)gmail.com>, 2014 # Mohsen Eghbal <Eghbalmohsen(a)gmail.com>, 2019 -# magnifico, 2019 +# Reza Ghasemi, 2019 # Samaneh M <asamana.haoma(a)gmail.com>, 2019 # Sina Eghbal <s.eghbal(a)gmail.com>, 2016 # b0b47d46632b78a09a40de799fda9a65, 2019 @@ -37,8 +37,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 13:13+0000\n" -"Last-Translator: Paolo Spada <donpaolospada(a)protonmail.com>\n" +"PO-Revision-Date: 2020-04-17 17:36+0000\n" +"Last-Translator: Hamid reza Zaefarani\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1467,21 +1467,21 @@ msgstr "اطلاعات بیشتر در مورد Tails را یاد بگیرید" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-delete.desktop.in.h:1 msgid "Delete persistent volume" -msgstr "" +msgstr "حذف حجم ذخیره سازی پایدار" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-delete.desktop.in.h:2 msgid "Delete the persistent volume and its content" -msgstr "" +msgstr "حذف حجم ذخیره سازی پایدار و محتویات آن" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-setup.desktop.in.h:1 msgid "Configure persistent volume" -msgstr "" +msgstr "پیکربندی حجم ذخیره سازی پایدار" #: ../config/chroot_local-includes/usr/share/applications/tails-persistence-setup.desktop.in.h:2 msgid "" "Configure which files and application configuration are saved between " "working sessions" -msgstr "" +msgstr "تنظیم کنید که کدام پرونده‌ها و پیکربندی برنامه‌ها بین جلسات کاری ذخیره می‌شوند" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 msgid "Tor Browser"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit 606c56898cb99f72002a1fda4433f6d8d45bca09 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 17:45:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- fa/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index c3ae7967da..3342ee886d 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-15 19:46+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-04-17 17:39+0000\n" +"Last-Translator: Hamid reza Zaefarani\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -197,7 +197,7 @@ msgstr "%sد%sریافت پل‌ها" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[این یک ایمیل خودکار می‌باشد.]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" @@ -409,7 +409,7 @@ msgstr "" #: bridgedb/strings.py:173 msgid "(Request unobfuscated Tor bridges.)" -msgstr "" +msgstr "(درخواست پل‌های تور نا‌مبهم.)" #: bridgedb/strings.py:174 msgid "(Request IPv6 bridges.)"

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit dbe9c7eda88687a510f2ad5c1bd80a78542a872d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 16:45:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ru/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po index ad3770c402..b556f22a3d 100644 --- a/ru/LC_MESSAGES/bridgedb.po +++ b/ru/LC_MESSAGES/bridgedb.po @@ -33,8 +33,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-15 19:46+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-04-17 16:33+0000\n" +"Last-Translator: diana azaryan <dianazryn(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -205,7 +205,7 @@ msgstr "%sП%sолучить адреса мостов" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[Это автоматическое письмо.]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" @@ -222,7 +222,7 @@ msgstr "Вы превысили допустимый лимит. Пожалуй msgid "" "If these bridges are not what you need, reply to this email with one of\n" "the following commands in the message body:" -msgstr "" +msgstr "Если эти мосты не то, что вам нужно, ответьте на это письмо\nс помощью одной из следующих команд в теле сообщения:" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".

1 0

[tor-browser-bundle-testsuite/master] Bug 33926: Add a LICENSE file ("3-clause BSD" license)
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 2357de09b5e66dddf749a4fec042940abcafabca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 17 15:16:11 2020 +0200 Bug 33926: Add a LICENSE file ("3-clause BSD" license) --- LICENSE | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a8acdf3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +Copyright (c) 2020, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-build/master] Bug 32038: Add a LICENSE file
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 49319fa1afea0f0f0e2ce16b7d61da95f39c79b2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 31 20:28:27 2020 +0200 Bug 32038: Add a LICENSE file --- LICENSE | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ee29ae2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,37 @@ +This file contains the license for the build recipes and tools used in +the Tor Browser development process, that are included in this repository. + +For the license of specific components included in Tor Browser, see +directory projects/tor-browser/Bundle-Data/Docs/Licenses. + +=============================================================================== + +Copyright (c) 2020, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-build/master] Bug 32788: Specify version for test builds
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit 3310abeac20111775407177fb95f4ede3d50251c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 17 06:46:29 2020 +0000 Bug 32788: Specify version for test builds With our switch to including a date into our nightly build versioning (#25009) testing patches with test builds got harder. The firefox part has to be rebuilt every day now as it includes the version number, even if no code changes occurred. That slows down testing of patches significantly. We hardcode "testing" as the test build version number to fix that and use "20010101010101" for the build date. Thanks to boklm for help. --- projects/firefox/get-moz-build-date | 4 ++++ rbm.conf | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date index e6989ff..a43f2f7 100755 --- a/projects/firefox/get-moz-build-date +++ b/projects/firefox/get-moz-build-date @@ -8,6 +8,10 @@ my ($year, $version) = @ARGV; my $date; if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) { $date = sprintf("%d%02d%02d010101", $1, $2, $3); +} elsif ($version eq 'testbuild') { + # There is no need for an increasing build date in test builds. Just hardcode + # it. + $date = 20010101010101; } else { my @v = split(/[\.ab]/, $version); push @v, '0' if @v < 4; diff --git a/rbm.conf b/rbm.conf index cd17da9..94f9fcc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -151,7 +151,16 @@ targets: var: nightly: 1 channel: nightly - torbrowser_version: '[% ENV.TORBROWSER_NIGHTLY_VERSION ? ENV.TORBROWSER_NIGHTLY_VERSION : c("var_p/nightly_torbrowser_version") %]' + torbrowser_version: | + [% + IF ENV.TORBROWSER_NIGHTLY_VERSION; + GET ENV.TORBROWSER_NIGHTLY_VERSION; + ELSIF c("var/testbuild"); + GET "testbuild"; + ELSE; + GET c("var_p/nightly_torbrowser_version"); + END; + -%] # For nightly builds, we support updates for a limited set of locales mar_locales: - de

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 17 Apr '20

17 Apr '20

commit ecdd704c6adb88f605c03e0b200fe02069caed4b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 07:53:54 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+it.po | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/contents+it.po b/contents+it.po index f562099126..9f50e7276d 100644 --- a/contents+it.po +++ b/contents+it.po @@ -1210,6 +1210,10 @@ msgid "" "(\"≡\")](../hamburger-menu) at the top-right of the screen, then navigating " "to \"Add-ons\"." msgstr "" +"Il [Tor Browser](../tor-browser) include un [add-on](../add-on-extension-or-" +"plugin) chiamato NoScript, a cui si può accedere dal [menù ad hamburger" +"(\"≡\")](../hamburger-menu) in alto a destra dello schermo e poi navigando " +"verso \"Add-ons\"" #: https//support.torproject.org/glossary/noscript/ #: (content/glossary/noscript/contents+en.lrword.definition) @@ -1290,6 +1294,9 @@ msgid "" "A standardized Internet domain name used by onion services that end in " ".onion and is designed to be [self-authenticating](../self-authenticating)." msgstr "" +"Un dominio internet standardizzato utilizzato dai servizi onion che finisce " +"con .onion ed è progettato per l'[autenticazione personale](../self-" +"authenticating)." #: https//support.torproject.org/glossary/onion-address/ #: (content/glossary/onion-address/contents+en.lrword.translation) @@ -1297,6 +1304,8 @@ msgid "" "Can be partially or totally translated, i.e. for Spanish 'dirección cebolla'" " or 'dirección onion'." msgstr "" +"Può essere tradotto parzialmente o totalmente. Per esempio: in spagnolo " +"'dirección cebolla' o 'dirección onion'." #: https//support.torproject.org/glossary/onion-browser/ #: (content/glossary/onion-browser/contents+en.lrword.term) @@ -1388,6 +1397,9 @@ msgid "" "protocol to learn about currently running [Tor relays](../relay) and " "[bridges](../bridge)." msgstr "" +"[Onionoo](https://metrics.torproject.org/onionoo.html) è un protocollo web-" +"based per imparare circa gli attuali [Tor relays](../relay) e " +"[ponti](../bridge)." #: https//support.torproject.org/glossary/onionoo/ #: (content/glossary/onionoo/contents+en.lrword.definition)

1 0

[tor-browser-build/master] Bug 33359: Use latest Version of TOPL and Remove Patches
by gk＠torproject.org 17 Apr '20

17 Apr '20

commit d567f0f9fc3cebd4f57ee928b6b2c185137403d5 Author: sisbell <shane.isbell(a)gmail.com> Date: Mon Feb 17 21:56:11 2020 -0800 Bug 33359: Use latest Version of TOPL and Remove Patches --- ...ustom-obfs4-bridge-does-not-work-on-Tor-B.patch | 146 --------------------- projects/tor-onion-proxy-library/build | 2 - .../tor-onion-proxy-library/canceldormant.patch | 46 ------- projects/tor-onion-proxy-library/config | 4 +- 4 files changed, 1 insertion(+), 197 deletions(-) diff --git a/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch b/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch deleted file mode 100644 index 2d1bc51..0000000 --- a/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 0a482a749fd770827d3d6c71debb112a07e7fae3 Mon Sep 17 00:00:00 2001 -From: sisbell <shane.isbell(a)gmail.com> -Date: Thu, 14 Nov 2019 13:43:09 -0800 -Subject: [PATCH] Bug 30767: Custom obfs4 bridge does not work on Tor Browser - for Android - -TOPL fixes #134 ---- - .../thali/toronionproxy/TorConfigBuilder.java | 63 ++++++++----------- - 1 file changed, 26 insertions(+), 37 deletions(-) - -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -index e324d9f..da9a6a2 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -@@ -99,25 +99,32 @@ public final class TorConfigBuilder { - return this; - } - -+ @SettingsConfig -+ public TorConfigBuilder bridgesFromSettings() { -+ try { -+ addBridgesFromResources(); -+ } catch (IOException e) { -+ e.printStackTrace(); -+ } -+ return this; -+ } -+ - public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportClient) throws IOException { -- List<String> supportedBridges = settings.getListOfSupportedBridges(); -- if (pluggableTransportClient == null || !settings.hasBridges() || supportedBridges.size() < 1) { -+ if (pluggableTransportClient == null) { - return this; - } - -- if (!pluggableTransportClient.exists() || !pluggableTransportClient.canExecute()) { -+ if (!pluggableTransportClient.exists()) { - throw new IOException("Bridge binary does not exist: " + pluggableTransportClient - .getCanonicalPath()); - } - -- if (supportedBridges.contains("obfs3") || supportedBridges.contains("obfs4")) { -- transportPluginObfs(pluggableTransportClient.getCanonicalPath()); -- } -- if (supportedBridges.contains("meek")) { -- transportPluginMeek(pluggableTransportClient.getCanonicalPath()); -+ if (!pluggableTransportClient.canExecute()) { -+ throw new IOException("Bridge binary is not executable: " + pluggableTransportClient -+ .getCanonicalPath()); - } -- String type = supportedBridges.contains("meek") ? "meek_lite" : "obfs4"; -- addBridgesFromResources(type, 2); -+ -+ transportPlugin(pluggableTransportClient.getCanonicalPath()); - return this; - } - -@@ -471,14 +478,8 @@ public final class TorConfigBuilder { - return transPort(settings.transPort()); - } - -- public TorConfigBuilder transportPluginMeek(String clientPath) { -- buffer.append("ClientTransportPlugin meek_lite exec ").append(clientPath).append('\n'); -- return this; -- } -- -- public TorConfigBuilder transportPluginObfs(String clientPath) { -- buffer.append("ClientTransportPlugin obfs3 exec ").append(clientPath).append('\n'); -- buffer.append("ClientTransportPlugin obfs4 exec ").append(clientPath).append('\n'); -+ public TorConfigBuilder transportPlugin(String clientPath) { -+ buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); - return this; - } - -@@ -489,7 +490,7 @@ public final class TorConfigBuilder { - - @SettingsConfig - public TorConfigBuilder useBridgesFromSettings() { -- return !settings.hasBridges() ? dontUseBridges() : this; -+ return settings.hasBridges() ? useBridges() : this; - } - - public TorConfigBuilder virtualAddressNetwork(String address) { -@@ -518,12 +519,12 @@ public final class TorConfigBuilder { - * </code> - * - */ -- TorConfigBuilder addBridgesFromResources(String type, int maxBridges) throws IOException { -+ TorConfigBuilder addBridgesFromResources() throws IOException { - if(settings.hasBridges()) { - InputStream bridgesStream = context.getInstaller().openBridgesStream(); - int formatType = bridgesStream.read(); -- if(formatType == 0) { -- addBridges(bridgesStream, type, maxBridges); -+ if (formatType == 0) { -+ addBridges(bridgesStream); - } else { - addCustomBridges(bridgesStream); - } -@@ -534,23 +535,14 @@ public final class TorConfigBuilder { - /** - * Add bridges from bridges.txt file. - */ -- private void addBridges(InputStream input, String bridgeType, int maxBridges) { -- if (input == null || isNullOrEmpty(bridgeType) || maxBridges < 1) { -+ private void addBridges(InputStream input) { -+ if (input == null) { - return; - } -- boolean hasAddedBridge = false; - List<Bridge> bridges = readBridgesFromStream(input); -- Collections.shuffle(bridges, new Random(System.nanoTime())); -- int bridgeCount = 0; - for (Bridge b : bridges) { -- if (b.type.equals(bridgeType)) { -- bridge(b.type, b.config); -- hasAddedBridge = true; -- if (++bridgeCount > maxBridges) -- break; -- } -+ bridge(b.type, b.config); - } -- if(hasAddedBridge) useBridges(); - } - - /** -@@ -560,15 +552,12 @@ public final class TorConfigBuilder { - if (input == null) { - return; - } -- boolean hasAddedBridge = false; - List<Bridge> bridges = readCustomBridgesFromStream(input); - for (Bridge b : bridges) { - if (b.type.equals("custom")) { - bridgeCustom(b.config); -- hasAddedBridge = true; - } - } -- if(hasAddedBridge) useBridges(); - } - - private static List<Bridge> readBridgesFromStream(InputStream input) { --- -2.20.1 - diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 9a8b31e..21c8f7a 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -20,8 +20,6 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # Gradle patch provided so that when generating a gradle dependency list, the # build will pull down the correct android tool versions patch -p1 < $rootdir/gradle.patch -patch -p1 < $rootdir/canceldormant.patch -patch -p1 < $rootdir/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] diff --git a/projects/tor-onion-proxy-library/canceldormant.patch b/projects/tor-onion-proxy-library/canceldormant.patch deleted file mode 100644 index 8d48af1..0000000 --- a/projects/tor-onion-proxy-library/canceldormant.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java -index 5f5adac..da6747f 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java -@@ -187,4 +187,9 @@ public class DefaultSettings implements TorSettings { - public boolean useSocks5() { - return false; - } -+ -+ @Override -+ public boolean hasDormantCanceledByStartup() { -+ return false; -+ } - } -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -index e324d9f..99e5693 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -@@ -503,6 +503,16 @@ public final class TorConfigBuilder { - return virtualAddressNetwork(settings.getVirtualAddressNetwork()); - } - -+ public TorConfigBuilder dormantCanceledByStartup() { -+ buffer.append("DormantCanceledByStartup 1").append('\n'); -+ return this; -+ } -+ -+ @SettingsConfig -+ public TorConfigBuilder domantCanceledByStartupFromSettings() { -+ return settings.hasDormantCanceledByStartup() ? dormantCanceledByStartup() : this; -+ } -+ - /** - * Adds bridges from a resource stream. This relies on the TorInstaller to know how to obtain this stream. - * These entries may be type-specified like: -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java -index 2d515d1..43f01ef 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java -@@ -77,4 +77,6 @@ public interface TorSettings { - String transPort(); - - boolean useSocks5(); -+ -+ boolean hasDormantCanceledByStartup(); - } diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index c682078..080f0c2 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: a720e25bcdada2e6ba5c8cb1f566a6b633b79dc5 +git_hash: aeb63ebd079b646a3ec1b7b84d755653baa467d7 git_url: https://github.com/thaliproject/Tor_Onion_Proxy_Library.git git_submodule: 1 @@ -25,5 +25,3 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch - - filename: canceldormant.patch - - filename: 0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch

1 0

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 16 Apr '20

16 Apr '20

commit 2d17ffe2951286a159fb6e1762caab743b515969 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 01:53:10 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-ar.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tor-outreach2019-2020-ar.md b/tor-outreach2019-2020-ar.md index 4dab2c5b99..2bfd6b4a36 100644 --- a/tor-outreach2019-2020-ar.md +++ b/tor-outreach2019-2020-ar.md @@ -145,18 +145,18 @@ All of this software uses Tor to help protect Jelani’s privacy. مجتمع تور يخضع إلى مجموعة من القواعد السلوكية، ونحن نوضح مجموعة وعودنا إلى المجتمع في عقدنا الاجتماعي. -Learn more about Tor by visiting our website, our wiki, finding us on IRC, joining one of our mailing lists, or signing up for Tor News at newsletter.torproject.org. +تعرف على المزيد عن تور عبر زيارة موقعنا، مدونة الويكي، ابحث عنا في IRC، اشترك في قائمتنا البريدية، أو قم بالتسجيل في أخبر تور من خلال newsletter.torproject.org. -## 8. Download Tor +## 8. تحميل تور -Tor for Desktop +تور للكمبيوتر torproject.org/download تور على الموبايل ### أندرويد -Tor Browser for Android is available from GooglePlay. +متصفح تور للأندرويد متاح على جوجل بلاي. -### iOS -Onion Browser, developed by M. Tigas, is the only browser we recommend for iOS. +### آي أو إس +متصفح البصل، الذي تم تطويره بواسطة M. Tigas، هو المتصفح الوحيد الذي ننصح به من أجل نظام آي أو إس.

1 0

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 16 Apr '20

16 Apr '20

commit ed0b80d88646961ea106bcdd874ed33040ea862e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 17 01:23:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-ar.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tor-outreach2019-2020-ar.md b/tor-outreach2019-2020-ar.md index 8bcb30f17a..4dab2c5b99 100644 --- a/tor-outreach2019-2020-ar.md +++ b/tor-outreach2019-2020-ar.md @@ -80,7 +80,7 @@ All of this software uses Tor to help protect Jelani’s privacy. جان ظل يقرأ من أجل العثور على خيارات أخرى وعلم عن متصفح تور وكيف يمكنه التحايل على المراقبة. -He found an official website mirror to download the program. +لقد عثر على مرءاة للموقع الرسمي لتحميل البرنامج. عندما فتح ** Tor Browser ** ، اتبع التعليمات الخاصة بالمستخدمين الخاضعين للرقابة ومتصلًا بجسر يسمح له بالوصول إلى الإنترنت مرة أخرى. @@ -90,15 +90,15 @@ He found an official website mirror to download the program. --- -# 5. Shared Sections +# 5. الأقسام المشتركة ## ما هو تور؟ -Tor is free software and an open network that helps protect you from tracking, surveillance, and censorship online. -Tor is created for free by a 501(c)3 U.S.-based nonprofit called the Tor Project. +تور هو برنامج مجاني وشبكة مفتوحة تساعد على حمايتك من التتبع، المراقبة، والرقابة عبر الإنترنت. +تور تم إنشائه مجانًا بواسطة شركة غير ربحية 501(c)3 تسمى "مشروع تور" مقرها الولايات المتحدة الأمريكية. -The easiest way to use Tor is Tor Browser. -When you use Tor Browser, no one can see what websites you visit or where in the world you’re coming from. +الطريقة الأسهل لاستخدام شبكة تور هي متصفح تور. +عندما تستخدم متصفح تور، لا يوجد أحد يمكنه رؤية ما هي المواقع التي تزورها أو من أي دولة من حول العالم تزور الموقع. التطبيقات الأخرى، مثل SecureDrop وOnionShare، تستخدم تور لحماية مستخدميها ضد المراقبة والرقابة. @@ -107,17 +107,17 @@ When you use Tor Browser, no one can see what websites you visit or where in the ترغب Amal في زيارة موقع Bekele الخاص ، لذا فتحت متصفح Tor. -Tor Browser selects a random circuit of three relays, which are computers all over the world configured to route traffic over the Tor network. +متصفح تور يختار دائرة عشوائية مكونة من ثلاث طبقات أو مُرحلات، وهي عبارة عن حواسيب منتشرة حول العالم ومهيئة لكي تقوم بإعادة توجيه الزيارات عبر شبكة تور. تقوم Tor Browser بعد ذلك بتشفير طلب موقع الويب الخاص بها ثلاث مرات وإرساله إلى مرحل Tor الأول في دائرتها. -The first relay removes the first encryption layer but doesn't learn that the destination is Bekele’s website. +المُرحل الأول يقوم بإزالة طبقة التشفير الأولى ولكنه لا يعلم ما هي الوجهة التي يريدها الزائر. -The first relay learns only the next location in the circuit, which is the second relay. +المُرحل الأول يعلم فقط الموقع التالي في دائرة الاتصال، وهو المُرحل الثاني. -The second relay removes another encryption layer and forwards the web page request to the third relay. +المُرحل الثاني يقوم بإزالة طبقة أخرى من التشفير ويوجه طلب صفحة الويب إلى المُرحل الثالث. -The third relay removes the last encryption layer and forwards the web page request to its destination, Bekele’s website, but it doesn't know the request comes from Amal. +المُرحل الثالث يقوم بإزالة آخر طبقة تشفير ويوجه طلب صفحة الويب إلى وجهتها، على سبيل المثال موقع بيكيلي، لكنه لا يعرف أن طلب الوصول لهذا الموقع يأتي من أمل. لا تعرف بيكيلي أن طلب الموقع جاء من أمل ما لم تخبره بذلك. @@ -125,25 +125,25 @@ The third relay removes the last encryption layer and forwards the web page requ يستخدم الناس في جميع أنحاء العالم Tor لحماية خصوصيتهم والوصول إلى الويب بحرية. -Tor helps protect journalists, human rights defenders, domestic violence victims, academic researchers, and anyone experiencing tracking, censorship, or surveillance. +تور يساعد على حماية الصحفيين، المدافعين عن حقوق الإنسان، ضحايا العنف المحلي، الباحثين الأكاديميين، وأي شخص يتعرض للتعقب والرقابة. ## 6. لماذا تثق تور؟ -Tor is designed for privacy. We don’t know who our users are, and we don't keep logs of user activity. +تور مصمم من أجل الخصوصية. نحن لا نعلم من يكون مستخدمونا، ولا نبقي سجلات لنشاط المستخدم. -Tor relay operators cannot reveal the true identity of Tor users. +مشغلوا مُرحلات تور لا يستطيعون كشف الهوية الحقيقية لمستخدمي تور. -Continual peer review of Tor's source code by academic and open source communities ensures that there are no backdoors in Tor, and our social contract promises that we will never backdoor Tor. +إن مراجعة النظراء المستمرة للكود المصدري الخاص بتور من قبل الأوساط الأكاديمية والمجتمعات مفتوحة المصدر تضمن أنه لا توجد أي أبواب خلفية في تور، كما أن عقدنا الاجتماعي يعد بأنه لن نقوم أبدًا بإنشاء أبواب خلفية في تور. ## 7. انضم إلى مجتمع Tor -Tor is made possible by a diverse set of users, developers, relay operators, and advocates from around the world. +تور أصبح ممكنًا بواسطة مجموعات متنوعة من المستخدمين، مطورين، مشغلي الترحيل، المؤيدين من حول العالم. -We need your help to make Tor more usable and secure for people everywhere. +نحن نحناج إلى مساعدتك من أجل جعل تور أكثر قابلية للاستخدام وأكثر أمنًا من أجل الأشخاص من كل مكان. -You can volunteer with Tor by writing code, running a relay, creating documentation, offering user support, or telling people in your community about Tor. +يمكنك التطوع مع تور من خلال كتابة كود، تشغيل مُرحل، إنشاء توثيق، عرض دعم للمستخدم، أو إخبار الأشخاص في مجتمعك عن تور. -The Tor community is governed by a code of conduct, and we outline our set of promises to the community in our social contract. +مجتمع تور يخضع إلى مجموعة من القواعد السلوكية، ونحن نوضح مجموعة وعودنا إلى المجتمع في عقدنا الاجتماعي. Learn more about Tor by visiting our website, our wiki, finding us on IRC, joining one of our mailing lists, or signing up for Tor News at newsletter.torproject.org.

1 0