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

[translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
by translation＠torproject.org 01 May '20

01 May '20

commit d4d31706603524d08c248b636aa1ed2140735e82 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 1 20:18:58 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da.po b/da.po index a755fe1a18..b612c9baf0 100644 --- a/da.po +++ b/da.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-11-28 16:51+0100\n" -"PO-Revision-Date: 2020-05-01 19:04+0000\n" +"PO-Revision-Date: 2020-05-01 20:01+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -82,14 +82,14 @@ msgstr "Denne version af Tails er forældet, og kan indeholde sikkerhedsprobleme msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "Den tilgængelige gradvise opgradering kræver %{space_needed} ledig plads på Tailss systempartition, men der er kun %{free_space} til rådighed." +msgstr "Den tilgængelige gradvise opgradering kræver %{space_needed} ledig plads på Tailss systempartition, men der er kun %{free_space} tilgængelig." #: ../lib/Tails/IUK/Frontend.pm:336 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "Den tilgængelige gradvise opgradering kræver %{memory_needed} ledig hukommelse, men der er kun %{free_memory} til rådighed." +msgstr "Den tilgængelige gradvise opgradering kræver %{memory_needed} ledig hukommelse, men der er kun %{free_memory} tilgængelig." #: ../lib/Tails/IUK/Frontend.pm:358 msgid ""

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 01 May '20

01 May '20

commit 8a5af26858040fe3b5cd21b816f17e8f7c09bde9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 1 20:18:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- da.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da.po b/da.po index a520be57a6..2ba0cf5604 100644 --- a/da.po +++ b/da.po @@ -21,7 +21,7 @@ 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-05-01 19:45+0000\n" +"PO-Revision-Date: 2020-05-01 20:17+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n"

1 0

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

01 May '20

commit 24bb5a73758db72b451dd1e9a2a0b54e8617877e Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 1 20:17:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- da.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/da.po b/da.po index c507b0fafd..35bc41e592 100644 --- a/da.po +++ b/da.po @@ -21,7 +21,7 @@ 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-05-01 19:45+0000\n" +"PO-Revision-Date: 2020-05-01 20:16+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "\n" -msgstr "<h1>Hjælp os med at rette din fejl!</h1>\nLæs <a href=\"%s\">vores fejlrapporteringsinstruktioner</a>.\nInkludér ikke mere personlig information end der\ner brug for!\n<h2>Vedrørende det at give os en e-mailadresse</h2>\n\nVed at give os en e-mailadresse giver det os mulighed til at kontakte dig for at præcisere problemet. Det\ner nødvendigt for størstedelen af indsendte rapporter vi modtager, idet de fleste rapporter\nuden kontaktinformation er ubrugelige. På den anden side åbner det dog også\nen mulighed for aflytning, såsom din e-mail- eller internetudbyder, for at\nbekræfte at du bruger Tails.\n\n" +msgstr "<h1>Hjælp os med at rette din fejl!</h1>\nLæs <a href=\"%s\">vores fejlrapporteringsinstruktioner</a>.\nInkludér ikke mere personlig information end hvad der\ner brug for!\n<h2>Angående det at give os en e-mailadresse</h2>\n\nVed at give os en e-mailadresse giver det os mulighed til at kontakte dig for at præcisere problemet. Det\ner nødvendigt for langt størstedelen af de rapporter vi modtager, idet de fleste rapporter\nuden kontaktinformation er ubrugelige. På den anden side giver det også\nen mulighed for aflytning, såsom din e-mail- eller internetudbyder, for at\nbekræfte at du bruger Tails.\n\n" #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8 #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100 @@ -65,7 +65,7 @@ msgstr "Yderligere software" msgid "" "You can install additional software automatically from your persistent " "storage when starting Tails." -msgstr "Du kan automatisk installere yderligere software fra dit vedvarende lager når Tails startes." +msgstr "Du kan automatisk installere yderligere software fra dit vedvarende lager når Tails starter." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77 msgid "" @@ -93,7 +93,7 @@ msgstr "Vedvarende er deaktiveret for Electrum" msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n" "It is strongly recommended to only run Electrum when its persistence feature is activated." -msgstr "Når du genstarter Tails vil alle Electrums data gå tabt, inklusiv din Bitcoin-pung.\nDet anbefales stærkt at du kun kører Electrum når vedvarende-funktionaliteten er aktiveret." +msgstr "Når du genstarter Tails vil alle Electrums data gå tabt, inklusiv din Bitcoin-pung.\nDet anbefales stærkt at du kun kører Electrum når dens vedvarende-funktionalitet er aktiveret." #: config/chroot_local-includes/usr/local/bin/electrum:65 msgid "Do you want to start Electrum anyway?" @@ -115,7 +115,7 @@ msgstr "_Afslut" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "Få fejlretningsinfo ved at køre kommandoen: sudo tails-debugging-info" +msgstr "Få fejlretningsinformation ved at køre følgende kommando: sudo tails-debugging-info" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:244 msgid "" @@ -124,7 +124,7 @@ msgid "" "website.\\n\\nCheck your network connection, and restart Tails to try " "upgrading again.\\n\\nIf the problem persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "Der opstod en fejl under opdatering af underskriftsnøglen.\\n\\nSå er det ikke muligt at se om en opgradering er tilgængelig på vores websted.Tjek din netværksforbindelse og genstart Tails for at prøve at opgradere igen.\\n\\nHvis problemet fortsætter, gå til file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "Der opstod en fejl under opdatering af underskriftsnøglen.\\n\\nSå det ikke muligt at se om der findes en opgradering fra vores websted.Tjek din netværksforbindelse og genstart Tails for at prøve at opgradere igen.\\n\\nHvis problemet fortsætter, gå til file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:250 msgid "Error while updating the signing key" @@ -145,7 +145,7 @@ msgstr "Kunne ikke fastslå om der findes en opgradering fra vores websted.</ #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:297 msgid "no automatic upgrade is available from our website for this version" -msgstr "der findes ingen automatisk opgradering fra vores websted til denne version" +msgstr "der findes ikke nogen automatisk opgradering fra vores websted til denne version" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:303 msgid "your device was not created using a USB image or Tails Installer" @@ -153,7 +153,7 @@ msgstr "din enhed blev ikke oprettet med et USB-aftryk eller Tails-installations #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:308 msgid "Tails was started from a DVD or a read-only device" -msgstr "Tails er startet fra en DVD eller en enhed der ikke kan skrives til" +msgstr "Tails blev startet fra en DVD eller en enhed der ikke kan skrives til" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:313 msgid "there is not enough free space on the Tails system partition" @@ -166,7 +166,7 @@ msgstr "systemet har ikke nok tilgængelig hukommelse" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:324 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." -msgstr "Ingen forklaring tilgængelig fordi \"%{reason}s\"." +msgstr "Ingen forklaring tilgængelig pga. årsagen \"%{reason}s\"." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:346 msgid "The system is up-to-date" @@ -174,31 +174,31 @@ msgstr "Systemet er fuldt opdateret" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:351 msgid "This version of Tails is outdated, and may have security issues." -msgstr "Denne version af Tails er forældet, og kan indeholde sikkerhedsproblemer." +msgstr "Denne version af Tails er forældet, og kan have sikkerhedsproblemer." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:383 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "Den tilgængelige gradvise opgradering kræver %{space_needed} ledig plads på Tailss systempartition, men der er kun %{free_space} til rådighed." +msgstr "Den tilgængelige gradvise opgradering kræver %{space_needed} ledig plads på Tailss systempartition, men der er kun %{free_space} tilgængelig." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:399 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "Den tilgængelige gradvise opgradering kræver %{memory_needed} ledig hukommelse, men der er kun %{free_memory} til rådighed." +msgstr "Den tilgængelige gradvise opgradering kræver %{memory_needed} ledig hukommelse, men der er kun %{free_memory} tilgængelig." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:421 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "En gradvis opgradering er tilgængelig uden at der eksisterer en tilsvarende komplet opgradering.\nDette burde ikke ske. Rapportér venligst fejlen." +msgstr "Der findes en gradvis opgradering, men ikke en fuld opgradering.\nDet burde ikke ske. Rapportér venligst en fejl." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:425 msgid "Error while detecting available upgrades" -msgstr "Der opstod en fejl mens der blev søgt efter tilgængelige opgraderinger" +msgstr "Fejl under registrering af tilgængelige opgraderinger" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:435 #, perl-brace-format @@ -237,11 +237,11 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/upgrade/#manual" -msgstr "Du skal foretage en manual opgradering til %{name}s %{version}s.\n\nFå mere information om den nye version på %{details_url}s\n\nDet er ikke muligt at opgradere din enhed automatisk til den nye version: %{explanation}s.\n\nLær at foretage manual opgradering på https://tails.boum.org/doc/upgrade/#manual" +msgstr "Du bør foretage en manual opgradering til %{name}s %{version}s.\n\nFor mere information om den nye version, gå til %{details_url}s\n\nDet er ikke muligt automatisk at opgradere din enhed til den nye version: %{explanation}s.\n\nLær at foretage manual opgradering, gå til https://tails.boum.org/doc/upgrade/#manual" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:475 msgid "New version available" -msgstr "En ny version er tilgængelig" +msgstr "Der findes en ny version" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:556 msgid "Downloading upgrade" @@ -258,7 +258,7 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "Opgraderingen kunne ikke blive downloadet.\\n\\nCheck din netværksforbindelse, og genstart Tails for at prøve igen.\\n\\nHvis problemet ikke forsvinder, gå til file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" +msgstr "Opgraderingen kunne ikke downloades.\\n\\nTjek din netværksforbindelse og genstart Tails for at prøve at opgradere igen.\\n\\nHvis problemet ikke forsvinder, gå til file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:616 #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:635 @@ -270,11 +270,11 @@ msgstr "Fejl under download af opgradering" msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "Outputfilen \"%{output_file}s\" eksisterer ikke, men tails-iuk-get-target-file meldte ingen fejl. Rapportér venligst en fejl." +msgstr "Outputfilen \"%{output_file}s\" findes ikke, men tails-iuk-get-target-file meldte ikke fejl. Rapportér venligst en fejl." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:647 msgid "Error while creating temporary downloading directory" -msgstr "Der opstod en fejl under oprettelsen af den midlertidige downloadmappe" +msgstr "Fejl under oprettelse af midlertidig downloadmappe" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:650 msgid "Failed to create temporary download directory" @@ -289,7 +289,7 @@ msgstr "Kunne ikke vælge en downloadserver.\n\nDet burde ikke ske. Rappo #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:678 msgid "Error while choosing a download server" -msgstr "Der opstod en fejl under valg af downloadserver" +msgstr "Fejl under valg af downloadserver" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:693 msgid "" @@ -298,7 +298,7 @@ msgid "" "The network connection will now be disabled.\n" "\n" "Please save your work and close all other applications." -msgstr "Opgraderingen blev downloadet.\n\nNetværksforbindelsen vil nu blive deaktiveret.\n\nGem venligst dit arbejde og luk alle andre programmer." +msgstr "Opgraderingen blev downloadet.\n\nNetværksforbindelsen deaktiveres nu.\n\nGem venligst dit arbejde og luk alle de andre programmer." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:699 msgid "Upgrade successfully downloaded" @@ -711,7 +711,7 @@ msgstr "Bitcoin-klient" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167 msgid "Electrum's bitcoin wallet and configuration" -msgstr "Electrums bitcoin-tegnebog og -konfiguration" +msgstr "Electrums bitcoin-pung og -konfiguration" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180 msgid "Pidgin"

1 0

[tor-browser-build/master] Pick up tor-android-service changes for #33931
by gk＠torproject.org 01 May '20

01 May '20

commit b858dca8745b583afd2660389ccd5a96630154a0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 1 20:04:15 2020 +0000 Pick up tor-android-service changes for #33931 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 57f3fff..800fc47 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a +git_hash: ed2e1479eeddede01b1d510ef79dc5ec798b39c0 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 33931 - Patch TOPL for filtering bridges by type
by gk＠torproject.org 01 May '20

01 May '20

commit 04da65342a76f74b3d4a58601f326ded457dc97a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Apr 30 15:58:32 2020 +0000 Bug 33931 - Patch TOPL for filtering bridges by type --- ...ug-33931-Filter-bridges-in-stream-by-type.patch | 76 ++++++++++++++++++++++ projects/tor-onion-proxy-library/build | 2 + projects/tor-onion-proxy-library/config | 1 + 3 files changed, 79 insertions(+) diff --git a/projects/tor-onion-proxy-library/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch b/projects/tor-onion-proxy-library/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch new file mode 100644 index 0000000..e04e7d9 --- /dev/null +++ b/projects/tor-onion-proxy-library/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch @@ -0,0 +1,76 @@ +From 9a2048f02d602cab7bd937c66a4d3f9c35fbfa9e Mon Sep 17 00:00:00 2001 +From: Matthew Finkel <sysrqb(a)torproject.org> +Date: Thu, 30 Apr 2020 15:40:25 +0000 +Subject: [PATCH] Bug 33931 - Filter bridges in stream by type + +The InputStream contains a first-byte that indicates the format of the +following datastream. If the first-byte is 1, then the following stream +is a string of bridges that are separated by the '\n' byte. If the +first-byte is not 1, then the following data stream is default bridges +and that list should be filtered such that only the requested bridge +type is used. +--- + .../thali/toronionproxy/TorConfigBuilder.java | 35 ++++++++++++++++--- + 1 file changed, 31 insertions(+), 4 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 ab11948..2405097 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -535,9 +535,32 @@ public final class TorConfigBuilder { + TorConfigBuilder addBridgesFromResources() throws IOException { + if(settings.hasBridges()) { + InputStream bridgesStream = context.getInstaller().openBridgesStream(); +- int formatType = bridgesStream.read(); +- if (formatType == 0) { +- addBridges(bridgesStream); ++ // The first byte encodes the type of bridges contained within the ++ // following data stream. Currently, it may contain either default bridges ++ // or user-provided bridges. ++ int bridgesType = bridgesStream.read(); ++ ++ // When bridgesType is 0x01, then the following stream is ++ // user-provided (custom) bridges. ++ // When bridgesType is one of: 0x02 or 0x03, then the Stream ++ // consists of default PT bridges. That list must be filtered, after ++ // parsing each bridge line, such that only the requested bridge type ++ // is used. ++ if (bridgesType != 1) { ++ // Terrible hack. Must keep in sync with tas::CustomTorInstaller::openBridgesStream ++ // and transports defined by TorConfigBuilder::transportPlugin(). ++ String reqBridgeType; ++ switch (bridgesType) { ++ case 2: ++ reqBridgeType = "obfs4"; ++ break; ++ case 3: ++ reqBridgeType = "meek_lite"; ++ break; ++ default: ++ throw new IOException("Requested unknown transport type: " + bridgesType); ++ } ++ addBridges(bridgesStream, reqBridgeType); + } else { + addCustomBridges(bridgesStream); + } +@@ -548,12 +571,16 @@ public final class TorConfigBuilder { + /** + * Add bridges from bridges.txt file. + */ +- private void addBridges(InputStream input) { ++ private void addBridges(InputStream input, String bridgeType) { + if (input == null) { + return; + } + List<Bridge> bridges = readBridgesFromStream(input); + for (Bridge b : bridges) { ++ if (!b.type.equals(bridgeType)) { ++ // This is not the transport we're looking for. ++ continue; ++ } + bridge(b.type, b.config); + } + } +-- +2.20.1 + diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 21c8f7a..c8025ad 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -21,6 +21,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # build will pull down the correct android tool versions patch -p1 < $rootdir/gradle.patch +patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.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/config b/projects/tor-onion-proxy-library/config index 080f0c2..5d90481 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -25,3 +25,4 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch + - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch

1 0

[tor-android-service/master] Bug 33931 - Indicate bridge type in stream
by gk＠torproject.org 01 May '20

01 May '20

commit ed2e1479eeddede01b1d510ef79dc5ec798b39c0 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Apr 30 15:47:07 2020 +0000 Bug 33931 - Indicate bridge type in stream Use the first-byte to indicate if the following data stream contains default bridges or custom bridges. In addition, if the stream contains default bridges, then indicate if only one type of bridge should be used after parsing the stream. --- .../org/torproject/android/service/CustomTorInstaller.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java index e962137..198c981 100644 --- a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java +++ b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java @@ -48,6 +48,18 @@ public class CustomTorInstaller extends TorInstaller { */ String userDefinedBridgeList = Prefs.getBridgesList(); byte bridgeType = (byte) (userDefinedBridgeList.length() > 5 ? 1 : 0); + // Terrible hack. Must keep in sync with topl::addBridgesFromResources. + if (bridgeType == 0) { + switch (userDefinedBridgeList) { + case "obfs4": + bridgeType = 2; + break; + case "meek": + bridgeType = 3; + break; + } + } + ByteArrayInputStream bridgeTypeStream = new ByteArrayInputStream(new byte[]{bridgeType}); InputStream bridgeStream = (bridgeType == 1) ? new ByteArrayInputStream((userDefinedBridgeList + "\r\n").getBytes()) : context.getResources().getAssets().open("common/bridges.txt");

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 01 May '20

01 May '20

commit c6dd82037cfa3259b589a195175dfd5cce9f86aa Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 1 19:48:45 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da.po b/da.po index 284b9a3250..a520be57a6 100644 --- a/da.po +++ b/da.po @@ -21,7 +21,7 @@ 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-05-01 19:09+0000\n" +"PO-Revision-Date: 2020-05-01 19:45+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgstr "" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:42 msgid "Tor is ready" -msgstr "" +msgstr "Tor er klar" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43 msgid "You can now access the Internet."

1 0

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

01 May '20

commit 516f16c27653b94d9008d3b7d55d1f69eb7ae9ec Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 1 19:47:17 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/da.po b/da.po index 97d0a89c02..c507b0fafd 100644 --- a/da.po +++ b/da.po @@ -21,7 +21,7 @@ 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-05-01 19:09+0000\n" +"PO-Revision-Date: 2020-05-01 19:45+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -278,7 +278,7 @@ msgstr "Der opstod en fejl under oprettelsen af den midlertidige downloadmappe" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:650 msgid "Failed to create temporary download directory" -msgstr "Den midlertidige downloadmappe kunne ikke oprettes" +msgstr "Kunne ikke oprette midlertidig downloadmappe" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:674 msgid "" @@ -336,7 +336,7 @@ msgstr "Der opstod en fejl under genstart af systemet" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:729 msgid "Failed to restart the system" -msgstr "Systemet kunne ikke genstartes" +msgstr "Kunne ikke genstarte systemet" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:744 msgid "Error while shutting down the network"

1 0

[translation/tails-iuk_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk_completed
by translation＠torproject.org 01 May '20

01 May '20

commit bc2ae57c2b6d9fe0ccafb51f9427a67e0a80a1cc Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 1 19:19:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk_completed --- da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da.po b/da.po index 6bf9f3cdf8..a755fe1a18 100644 --- a/da.po +++ b/da.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-11-28 16:51+0100\n" -"PO-Revision-Date: 2020-05-01 13:33+0000\n" +"PO-Revision-Date: 2020-05-01 19:04+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "Kunne ikke fastsætte om der findes en opgradering fra vores websted.\n\nTjek din netværksforbindelse og genstart Tails for at prøve at opgradere igen.\n\nHvis problemet ikke forsvinder, gå til file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "Kunne ikke fastslå om der findes en opgradering fra vores websted.\n\nTjek din netværksforbindelse og genstart Tails for at prøve at opgradere igen.\n\nHvis problemet fortsætter, gå til file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: ../lib/Tails/IUK/Frontend.pm:236 msgid "no automatic upgrade is available from our website for this version"

1 0

[translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
by translation＠torproject.org 01 May '20

01 May '20

commit df88218b6141eb80527fcd20b2d7616643c66d21 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 1 19:19:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da.po b/da.po index 6bf9f3cdf8..a755fe1a18 100644 --- a/da.po +++ b/da.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-11-28 16:51+0100\n" -"PO-Revision-Date: 2020-05-01 13:33+0000\n" +"PO-Revision-Date: 2020-05-01 19:04+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "Kunne ikke fastsætte om der findes en opgradering fra vores websted.\n\nTjek din netværksforbindelse og genstart Tails for at prøve at opgradere igen.\n\nHvis problemet ikke forsvinder, gå til file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "Kunne ikke fastslå om der findes en opgradering fra vores websted.\n\nTjek din netværksforbindelse og genstart Tails for at prøve at opgradere igen.\n\nHvis problemet fortsætter, gå til file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: ../lib/Tails/IUK/Frontend.pm:236 msgid "no automatic upgrade is available from our website for this version"

1 0