[tor-commits] [stem/master] Allow control connection to IPv6 addresses
commit 1087ebf6dadad2cc3ee81ad5ba8dc35e327cb665 Author: Damian Johnson Date: Thu Sep 10 18:20:04 2020 -0700 Allow control connection to IPv6 addresses Controller.from_port() improperly rejects IPv6 addresses as invalid... https://github.com/torproject/stem/issues/74 This expands a few other methods to allow IPv6 addresses as well. --- docs/change_log.rst | 1 + stem/connection.py | 4 ++-- stem/control.py | 8 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index bbd13ef5..5a9a8928 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -61,6 +61,7 @@ The following are only available within Stem's `git repository * Socket based control connections often raised BrokenPipeError when closed * Added :func:`~stem.control.Controller.add_hidden_service_auth`, :func:`~stem.control.Controller.remove_hidden_service_auth`, and :func:`~stem.control.Controller.list_hidden_service_auth` to the :class:`~stem.control.Controller` * Incorrect filesystem encoding broke latin-1 cookie path (:ticket:`57`) + * Allow control connection to IPv6 addresses (:ticket:`74`) * **Descriptors** diff --git a/stem/connection.py b/stem/connection.py index f5f92464..68cfda45 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -357,8 +357,8 @@ async def connect_async(control_port: Tuple[str, Union[str, int]] = ('127.0.0.1' elif control_port: if len(control_port) != 2: raise ValueError('The control_port argument for connect() should be an (address, port) tuple.') -elif not stem.util.connection.is_valid_ipv4_address(control_port[0]): - raise ValueError("'%s' isn't a vaid IPv4 address" % control_port[0]) +elif not stem.util.connection.is_valid_ipv4_address(control_port[0]) and not stem.util.connection.is_valid_ipv6_address(control_port[0]): + raise ValueError("'%s' isn't a vaid address" % control_port[0]) elif control_port[1] != 'default' and not stem.util.connection.is_valid_port(control_port[1]): raise ValueError("'%s' isn't a valid port" % control_port[1]) diff --git a/stem/control.py b/stem/control.py index a232f4db..9a387f55 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1072,7 +1072,7 @@ class Controller(BaseController): import stem.connection -if not stem.util.connection.is_valid_ipv4_address(address): +if not stem.util.connection.is_valid_ipv4_address(address) and not stem.util.connection.is_valid_ipv6_address(address): raise ValueError('Invalid IP address: %s' % address) elif port != 'default' and not stem.util.connection.is_valid_port(port): raise ValueError('Invalid port: %s' % port) @@ -2611,7 +2611,7 @@ class Controller(BaseController): if not stem.util.connection.is_valid_port(port): raise stem.ProtocolError('GETCONF provided an invalid HiddenServicePort port (%s): %s' % (port, content)) -elif not stem.util.connection.is_valid_ipv4_address(target_address): +elif not stem.util.connection.is_valid_ipv4_address(target_address) and not stem.util.connection.is_valid_ipv6_address(target_address): raise stem.ProtocolError('GETCONF provided an invalid HiddenServicePort target address (%s): %s' % (target_address, content)) elif not stem.util.connection.is_valid_port(target_port): raise stem.ProtocolError('GETCONF provided an invalid HiddenServicePort target port (%s): %s' % (target_port, content)) @@ -2722,8 +2722,8 @@ class Controller(BaseController): if not stem.util.connection.is_valid_port(port): raise ValueError("%s isn't a valid port number" % port) -elif target_address and not stem.util.connection.is_valid_ipv4_address(target_address): - raise ValueError("%s isn't a valid IPv4 address" % target_address) +elif target_address and not stem.util.connection.is_valid_ipv4_address(target_address) and not stem.util.connection.is_valid_ipv6_address(target_address): + raise ValueError("%s isn't a valid IP address" % target_address) elif target_port is not None and not stem.util.connection.is_valid_port(target_port): raise ValueError("%s isn't a valid port number" % target_port) elif auth_type not in (None, 'basic', 'stealth'): ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit ee6514eb73c854d1d9ec828f67102457a2c16bb6 Author: Translation commit bot Date: Thu Sep 10 22:46:33 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- pt_BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 1a497592ed..bc6da5aed4 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -36,8 +36,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-07 14:12+0200\n" -"PO-Revision-Date: 2020-09-08 00:13+\n" -"Last-Translator: Igor Bk 13\n" +"PO-Revision-Date: 2020-09-10 22:33+\n" +"Last-Translator: C. E.\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
commit 9a176a47e58d43938ad6ca043227bddb714d85a0 Author: Translation commit bot Date: Thu Sep 10 22:45:19 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- pt_BR/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd index 318ac21dd1..19b35246a6 100644 --- a/pt_BR/https-everywhere.dtd +++ b/pt_BR/https-everywhere.dtd @@ -47,8 +47,8 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
commit a92dce3f25e41256dcfd8cc5435e9268dd67532c Author: Translation commit bot Date: Thu Sep 10 22:45:21 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed --- pt_BR/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd index d8f176ab99..79aa5e838a 100644 --- a/pt_BR/https-everywhere.dtd +++ b/pt_BR/https-everywhere.dtd @@ -47,6 +47,8 @@ + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
commit e8eec9597ca64fd13bff179f92b096f33cbf8d1a Author: Translation commit bot Date: Thu Sep 10 22:45:55 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- pt_BR.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index d7..3d8480f1bf 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -36,8 +36,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-07 14:12+0200\n" -"PO-Revision-Date: 2020-09-08 00:13+\n" -"Last-Translator: Igor Bk 13\n" +"PO-Revision-Date: 2020-09-10 22:33+\n" +"Last-Translator: C. E.\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -523,7 +523,7 @@ msgid "" "${filename}\n" "\n" "Renaming it to Passwords.kdbx would allow KeePassXC to open it automatically in the future." -msgstr "" +msgstr "Você quer renomear seu banco de dados KeePassXC?\n\nVocê tem um banco de dados KeePassXC em sua pasta Persistente:\n\n${filename}\n\nRenomeá-lo para Passwords.kdbx permitiria ao KeePassXC abri-lo automaticamente no futuro." #: config/chroot_local-includes/usr/local/bin/keepassxc:23 msgid "Rename" @@ -1144,7 +1144,7 @@ msgstr "Sincronizando o relógio do sistema" msgid "" "Tor needs an accurate clock to work properly, especially for Onion Services." " Please wait..." -msgstr "" +msgstr "Tor precisa de um relógio preciso para funcionar corretamente, especialmente para os Serviços Onion. Por favor, aguarde..." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit e73356791f9f77888aa4a89ecff70ce97a61abed Author: Translation commit bot Date: Thu Sep 10 21:16:33 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- he.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he.po b/he.po index b49f3eb388..719d14fe2c 100644 --- a/he.po +++ b/he.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-07 14:12+0200\n" -"PO-Revision-Date: 2020-09-10 10:11+\n" -"Last-Translator: ION\n" +"PO-Revision-Date: 2020-09-10 20:56+\n" +"Last-Translator: Omer I.S.\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
commit f06798cf1d9176a25aa86cf2f06db5b67cb9a710 Author: Translation commit bot Date: Thu Sep 10 21:15:55 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- he.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he.po b/he.po index 3828e75da1..36bf5b001a 100644 --- a/he.po +++ b/he.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-07 14:12+0200\n" -"PO-Revision-Date: 2020-09-10 10:11+\n" -"Last-Translator: ION\n" +"PO-Revision-Date: 2020-09-10 20:56+\n" +"Last-Translator: Omer I.S.\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -504,7 +504,7 @@ msgid "" "${filename}\n" "\n" "Renaming it to Passwords.kdbx would allow KeePassXC to open it automatically in the future." -msgstr "" +msgstr "Do you want to rename your KeePassXC database?\n\nYou have a KeePassXC database in your Persistent folder:\n\n${filename}\n\nRenaming it to Passwords.kdbx would allow KeePassXC to open it automatically in the future." #: config/chroot_local-includes/usr/local/bin/keepassxc:23 msgid "Rename" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
commit e1cea2f1573c0cf0b5e2e6a5352fe6dea4f54f7e Author: Translation commit bot Date: Thu Sep 10 19:15:20 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed --- lt/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lt/https-everywhere.dtd b/lt/https-everywhere.dtd index b76a0197c8..8a7bd394e4 100644 --- a/lt/https-everywhere.dtd +++ b/lt/https-everywhere.dtd @@ -47,6 +47,8 @@ + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
commit bcb8c2d9cf411850fd6d677601a396359ad1d68a Author: Translation commit bot Date: Thu Sep 10 19:15:18 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- lt/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lt/https-everywhere.dtd b/lt/https-everywhere.dtd index 269d09723b..830ed3e1d9 100644 --- a/lt/https-everywhere.dtd +++ b/lt/https-everywhere.dtd @@ -47,8 +47,8 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems
commit d40f58678503123fcbacbbbcd6c19b37e167ab86 Author: Georg Koppen Date: Sat Sep 5 11:25:23 2020 + Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems --- projects/clang-source/build| 7 ++ projects/clang-source/config | 2 + projects/clang-source/no-seh.patch | 145 + projects/firefox/build | 2 + projects/mingw-w64/build | 4 +- rbm.conf | 4 +- 6 files changed, 161 insertions(+), 3 deletions(-) diff --git a/projects/clang-source/build b/projects/clang-source/build index 860b8e4..d94fcbe 100644 --- a/projects/clang-source/build +++ b/projects/clang-source/build @@ -19,6 +19,13 @@ mv clang-tools-extra-[% c("version") %].src llvm/tools/clang/tools/extra mv libcxx-[% c("version") %].src llvm/projects/libcxx mv libcxxabi-[% c("version") %].src llvm/projects/libcxxabi mv lld-[% c("version") %].src llvm/tools/lld +[% IF c("var/windows-i686") %] + # mingw-w64 does not support SEH on 32bit systems. Make it possible to + # explicitly disable it. + cd llvm/tools + patch -p1 < $rootdir/no-seh.patch + cd ../../ +[% END %] mv compiler-rt-[% c("version") %].src llvm/projects/compiler-rt # We need libunwind only for mingw-w64-clang, don't include it as tightly by # putting it into projects/ diff --git a/projects/clang-source/config b/projects/clang-source/config index d0ae90c..8adb18e 100644 --- a/projects/clang-source/config +++ b/projects/clang-source/config @@ -30,3 +30,5 @@ input_files: name: libunwind file_gpg_id: 1 - filename: 43909.patch + - filename: no-seh.patch +enable: '[% c("var/windows-i686") %]' diff --git a/projects/clang-source/no-seh.patch b/projects/clang-source/no-seh.patch new file mode 100644 index 000..1a52e40 --- /dev/null +++ b/projects/clang-source/no-seh.patch @@ -0,0 +1,145 @@ +From 38cbe873d45cf3c881ef4113b48193edfd418f43 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= +Date: Mon, 27 Jul 2020 23:44:41 +0300 +Subject: [PATCH] Implement the --no-seh flag + +Previously this flag was just ignored. If set, set the +IMAGE_DLL_CHARACTERISTICS_NO_SEH bit, regardless of the normal safeSEH +machinery. + +In mingw configurations, the safeSEH bit might not be set in e.g. object +files built from handwritten assembly, making it impossible to use the +normal safeseh flag. As mingw setups don't generally use SEH on 32 bit +x86 at all, it should be fine to set that flag bit though - hook up +the existing GNU ld flag for controlling that. + +Differential Revision: https://reviews.llvm.org/D84701 + +diff --git a/lld/COFF/Config.h b/lld/COFF/Config.h +index 4b62cd05f4f..17ea0f8bcab 100644 +--- a/lld/COFF/Config.h b/lld/COFF/Config.h +@@ -135,6 +135,7 @@ struct Configuration { + bool safeSEH = false; + Symbol *sehTable = nullptr; + Symbol *sehCount = nullptr; ++ bool noSEH = false; + + // Used for /opt:lldlto=N + unsigned ltoo = 2; +diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp +index 15d6fb5121a..b569df07601 100644 +--- a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp +@@ -1574,9 +1574,10 @@ void LinkerDriver::link(ArrayRef argsArr) { + config->wordsize = config->is64() ? 8 : 4; + + // Handle /safeseh, x86 only, on by default, except for mingw. +- if (config->machine == I386 && +- args.hasFlag(OPT_safeseh, OPT_safeseh_no, !config->mingw)) +-config->safeSEH = true; ++ if (config->machine == I386) { ++config->safeSEH = args.hasFlag(OPT_safeseh, OPT_safeseh_no, !config->mingw); ++config->noSEH = args.hasArg(OPT_noseh); ++ } + + // Handle /functionpadmin + for (auto *arg : args.filtered(OPT_functionpadmin, OPT_functionpadmin_opt)) +diff --git a/lld/COFF/Options.td b/lld/COFF/Options.td +index 024b7be8f78..c7e2a5ea57e 100644 +--- a/lld/COFF/Options.td b/lld/COFF/Options.td +@@ -171,6 +171,7 @@ def include_optional : Joined<["/", "-", "/?", "-?"], "includeoptional:">, + HelpText<"Add symbol as undefined, but allow it to remain undefined">; + def kill_at : F<"kill-at">; + def lldmingw : F<"lldmingw">; ++def noseh : F<"noseh">; + def output_def : Joined<["/", "-", "/?", "-?"], "output-def:">; + def pdb_source_path : P<"pdbsourcepath", + "Base path used to make relative source file path absolute in PDB">; +diff --git a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp +index 5736281958f..aead781d38b 100644 +--- a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp +@@ -1352,7 +1352,7 @@ template void Writer::writeHeader() { + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_GUARD_CF; + if (config->integrityCheck) + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY; +- if (setNoSEHCharacteristic) ++ if (setNoSEHCharacteristic || config->noSEH) + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NO_SEH; + if (config->terminalServerAware) + pe->DLLCharacteristics |=
[tor-commits] [tor-browser-build/master] Bug 40077: Don't pass --no-insert-timestamp when building Firefox
commit f6e87613d6f36fded0674ad91e3937c7403bee26 Author: Georg Koppen Date: Sat Sep 5 15:00:56 2020 + Bug 40077: Don't pass --no-insert-timestamp when building Firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1612423 does that for us now when using mingw-w64. --- projects/firefox/build | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 4e1a077..d3c7139 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -77,8 +77,6 @@ fi # Make sure widl is not inserting random timestamps, see #21837. export WIDL_TIME_OVERRIDE="0" patch -p1 < $rootdir/nsis-uninstall.patch - # Make sure we link without inserting timestamps in general. - export LDFLAGS="-Wl,--no-insert-timestamp" [% END -%] [% IF c("var/namecoin") %] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit ea819cb7a62f12c6478a3195694cfa5dcc64c27b Author: Translation commit bot Date: Thu Sep 10 16:15:05 2020 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- id/LC_MESSAGES/bridgedb.po | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 1c36493ad7..975c58fb12 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -26,7 +26,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-09-10 15:43+\n" +"PO-Revision-Date: 2020-09-10 16:10+\n" "Last-Translator: Ridhwan Ikhwanto\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" @@ -313,7 +313,7 @@ msgid "" "The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n" "bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n" "solve the subsequent CAPTCHA." -msgstr "" +msgstr "Mekanisme penyaluran \"HTTPS\" membagikan jembatan melalui situs ini. Untuk mendapatkan\njembatan, kunjungi %sbridges.torproject.org%s, pilih opsi pilihan Anda, dan\nselesaikan CAPTCHA." #: bridgedb/strings.py:119 #, python-format @@ -323,7 +323,7 @@ msgid "" "your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n" "subsequent CAPTCHA, and Tor Browser will automatically add your new\n" "bridges." -msgstr "" +msgstr "Mekanisme penyaluran \"Moat\" adalah bagian dari Tor Browser, memungkinan pengguna untuk\nmeminta jembatan langsung dari pengaturan Tor Browser. Untuk mendapatkan jembatan, buka\n%spengaturan Tor%s pada Tor Browser Anda, klik \"request a new bridge\", selesaikan\nCAPTCHA dan Tor Browser akan secara otomatis menambahkan jembatan baru Anda." #: bridgedb/strings.py:125 #, python-format @@ -331,11 +331,11 @@ msgid "" "Users can request bridges from the \"Email\" distribution mechanism by sending an\n" "email to %sbrid...@torproject.org%s and writing \"get transport obfs4\" in the\n" "email body." -msgstr "" +msgstr "Pengguna dapat meminta jembatan melalui mekanisme penyaluran \"Surel\" dengan mengirim sebuah\nsurel ke %sbrid...@torproject.org%s dan menulis \"get transport obfs4\" pada\nisi surel." #: bridgedb/strings.py:129 msgid "Reserved" -msgstr "" +msgstr "Telah Direservasi" #: bridgedb/strings.py:130 #, python-format @@ -346,7 +346,7 @@ msgid "" "bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n" "see users for a long time. Note that the \"Reserved\" distribution mechanism is\n" "called \"Unallocated\" in %sbridge pool assignment%s files." -msgstr "" +msgstr "BridgeDB memiliki sejumlah kecil jembatan yang tidak disalurkan secara otomatis. Sebagai gantinya, kami mereservasi jembatan-jembatan ini untuk penyaluran secara manual\ndan membagikannya kepada LSM dan organisasi serta individu lainnya yang membutuhkan jembatan. Jembatan yang disalurkan melalui mekanisme \"Telah Direservasi\" mungkin tidak\nmendapatkan pengguna untuk waktu yang lama. Harap catat bahwa mekanisme penyaluran \"Telah Direservasi\" disebut sebagai\n\"Unallocated\" di berkas %sbridge pool assignment%s." #: bridgedb/strings.py:137 msgid "None" @@ -359,7 +359,7 @@ msgid "" "users. Note that on Relay Search, a freshly set up bridge's distribution\n" "mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n" "it will then change to the bridge's actual distribution mechanism.\n" -msgstr "" +msgstr "Jembatan yang memiliki mekanisme penyaluran \"Tidak Ada\" tidak disalurkan oleh BridgeDB.\nMembagikan jembatan dengan mekanisme penyaluran ini adalah tanggung jawab operator jembatan.\nHarap catat bahwa pada Relay Search, jembatan yang baru saja mulai beroperasi akan menampilkan mekanisme penyaluran \"Tidak Ada\" selama kira-kira satu hari. Mohon bersabar sedikit, dan\nmekanisme penyaluran yang ditampilkan akan berubah menjadi yang mekanisme penyaluran jembatan tersebut yang sebenarnya.\n" #: bridgedb/strings.py:148 msgid "Please select options for bridge type:" @@ -394,23 +394,23 @@ msgid "" " Manual explains how you can add your bridges to Tor Browser. If you are\n" " using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n" " are using Android, %sclick here%s." -msgstr "" +msgstr "Pertama, Anda perlu %smengunduh Tor Browser%s. Panduan Pengguna Tor Browser kami menjelaskan bagaimana Anda dapat menambahkan jembatan Anda ke Tor Browser. Apabila Anda menggunakan Windows, Linux atau OS X, %sklik disini%s untuk mempelajari lebih lanjut. Apabila Anda menggunakan Android, %sklik disini%s." #: bridgedb/strings.py:166 msgid "" "Add these bridges to your Tor Browser by opening
[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40078'
commit a7e90a70837f085cdca27245f96fe4a448e8d929 Merge: dc1c703 68c652e Author: Matthew Finkel Date: Thu Sep 10 15:54:02 2020 + Merge remote-tracking branch 'gkgl/bug_40078' projects/android-toolchain/build | 8 +--- projects/android-toolchain/config | 24 ++-- projects/fenix/build | 4 ++-- 3 files changed, 21 insertions(+), 15 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 40078: Include Gradle 6.5.1 and use it for fenix
commit 68c652e12775f4c473866874e9f6e6be273132db Author: Georg Koppen Date: Mon Sep 7 08:16:01 2020 + Bug 40078: Include Gradle 6.5.1 and use it for fenix --- projects/android-toolchain/build | 8 +--- projects/android-toolchain/config | 24 ++-- projects/fenix/build | 4 ++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 74a49f1..a0d5ee8 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -15,11 +15,13 @@ unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME # GeckoView is still using an older Android NDK, bundle it, too. unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME -unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME +unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME # GeckoView is still using an older Gradle, bundle it, too. -unzip -qq [% c("input_files_by_name/gradle_bin_old") %] -d $GRADLE_HOME +unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME # application-services is using a comparatively new Gradle, bundle it, too. -unzip -qq [% c("input_files_by_name/gradle_bin_new") %] -d $GRADLE_HOME +unzip -qq [% c("input_files_by_name/gradle63") %] -d $GRADLE_HOME +# Fenix switched to a fairly recent Gradle, add it as well. +unzip -qq [% c("input_files_by_name/gradle651") %] -d $GRADLE_HOME # NDK Archive for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 9fd997d..b8ef898 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -19,16 +19,17 @@ var: export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME -export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle_version") %]/bin +export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin google_repo: https://dl.google.com/android/repository android_api_level: 29 android_platform_revision: 04 android_ndk_version: 21 android_ndk_version_old: 20 android_ndk_revision: d - gradle_version_new: 6.3 - gradle_version: 5.6.4 - gradle_version_old: 5.1.1 + gradle651: 6.5.1 + gradle63: 6.3 + gradle564: 5.6.4 + gradle511: 5.1.1 input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' @@ -55,12 +56,15 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' name: android_ndk_compiler_old sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_new") %]-bin.zip -name: gradle_bin_new + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle651") %]-bin.zip +name: gradle651 +sha256sum: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle63") %]-bin.zip +name: gradle63 sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip -name: gradle_bin + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip +name: gradle564 sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_old") %]-bin.zip -name: gradle_bin_old + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle511") %]-bin.zip +name: gradle511 sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 diff --git a/projects/fenix/build b/projects/fenix/build index 0cde15d..806044b 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -31,7 +31,7 @@ cp $rootdir/[% c('input_files_by_name/topl') %]/* app/ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ [% IF c("var/fetch_gradle_dependencies") %] - gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint + $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint [% ELSE %] # Prepare Glean dependencies for offline build tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 @@ -45,7 +45,7 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ # not only for
[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40052_v2'
commit dc1c7038f4d7cbb37b00bbbeb29667c069018a1f Merge: 3aef0b0 1e1d42f Author: Matthew Finkel Date: Thu Sep 10 15:46:18 2020 + Merge remote-tracking branch 'gkgl/bug_40052_v2' projects/nsis/build | 5 - projects/nsis/config| 5 ++--- projects/nsis/no-insert-timestamp.patch | 27 --- 3 files changed, 2 insertions(+), 35 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 40052: Bump NSIS to 3.06.1
commit 1e1d42ffe955803ac13dc1e95e7bae1a29a7dd7b Author: Georg Koppen Date: Sun Sep 6 17:43:01 2020 + Bug 40052: Bump NSIS to 3.06.1 It seems our timestamp related patch is not needed anymore as building the .exe files twice without it gives the exact same result. --- projects/nsis/build | 5 - projects/nsis/config| 5 ++--- projects/nsis/no-insert-timestamp.patch | 27 --- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/projects/nsis/build b/projects/nsis/build index c6a6d3e..54287db 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -8,11 +8,6 @@ tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] cd /var/tmp/build/nsis-[% c('version') %]-src -# Adding --no-insert-timestamp to APPEND_LINKFLAGS is not working as it -# is used for both the host and cross-compiled parts, but this option is -# only valid for the Windows linker. Therefore we add it using a patch -# to the cross-compilation part only. -patch -p1 < $rootdir/no-insert-timestamp.patch [% IF c("var/windows-x86_64") %] # Seems like setting TARGET_ARCH is not enough so we need to patch build.cpp diff --git a/projects/nsis/config b/projects/nsis/config index ed9823d..36f29e2 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.05 +version: 3.06.1 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -16,8 +16,7 @@ input_files: - project: container-image - filename: 'nsis-[% c("version") %].tar.bz2' URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2' -sha256sum: b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9 - - filename: no-insert-timestamp.patch +sha256sum: 9b5d68bf1874a7b393432410c7e8c376f174d2602179883845d2508152153ff0 - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - name: zlib diff --git a/projects/nsis/no-insert-timestamp.patch b/projects/nsis/no-insert-timestamp.patch deleted file mode 100644 index 8053b82..000 --- a/projects/nsis/no-insert-timestamp.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur nsis-3.03-src/SCons/Config/gnu nsis-3.03-src.n/SCons/Config/gnu nsis-3.03-src/SCons/Config/gnu 2017-10-06 15:30:20.0 -0400 -+++ nsis-3.03-src.n/SCons/Config/gnu 2018-06-17 13:26:05.945495151 -0400 -@@ -102,6 +102,7 @@ - stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG'])# no standard libraries - stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])# 512 bytes align - stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file -+stub_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - stub_uenv = stub_env.Clone() - stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) -@@ -142,6 +143,7 @@ - plugin_env.Append(LINKFLAGS = ['$MAP_FLAG'])# generate map file - plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency - plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency -+plugin_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - plugin_uenv = plugin_env.Clone() - plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) -@@ -181,6 +183,7 @@ - - util_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables - util_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])# 512 bytes align -+util_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - - conf = FlagsConfigure(util_env) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit febca57a95b12a0b036af369c0838d49cd10c787 Author: Translation commit bot Date: Thu Sep 10 15:45:06 2020 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- id/LC_MESSAGES/bridgedb.po | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 43d553f9b7..1c36493ad7 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -26,7 +26,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-09-10 15:14+\n" +"PO-Revision-Date: 2020-09-10 15:43+\n" "Last-Translator: Ridhwan Ikhwanto\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" @@ -98,21 +98,21 @@ msgstr "Kode QR untuk jembatan Anda" #: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." -msgstr "Tampaknya ada galat kesalahan dalam mendapatkan QRCode Anda." +msgstr "Tampaknya ada kesalahan dalam mendapatkan Kode QR Anda." #: bridgedb/distributors/https/templates/bridges.html:68 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "QRCode ini berisi garis jembatan Anda. Pindai dengan pembaca QRCode untuk salin garis jembatan Anda ke perangkat seluler dan lainnya." +msgstr "Kode QR ini berisi baris jembatan Anda. Pindai dengan pembaca Kode QR untuk menyalin baris jembatan Anda ke perangkat seluler dan lainnya." #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB mengalami sebuah kesalahan." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." -msgstr "Belum ada bridge yang tersedia..." +msgstr "Belum ada jembatan yang tersedia..." #: bridgedb/distributors/https/templates/bridges.html:118 #: bridgedb/distributors/https/templates/bridges.html:122 @@ -141,7 +141,7 @@ msgstr "Langkah %s2%s" #: bridgedb/distributors/https/templates/index.html:30 #, python-format msgid "Get %s bridges %s" -msgstr "Dapatkan %s bridge %s" +msgstr "Dapatkan %s jembatan %s" #: bridgedb/distributors/https/templates/index.html:40 #, python-format @@ -152,7 +152,7 @@ msgstr "Langkah %s3%s" #: bridgedb/distributors/https/templates/index.html:47 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s" +msgstr "Sekarang %s tambahkan jembatan ke Tor Browser %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -161,7 +161,7 @@ msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s" #: bridgedb/distributors/https/templates/options.html:42 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sB%serikan saya bridge!" +msgstr "%sB%serikan saya jembatan!" #: bridgedb/distributors/https/templates/options.html:55 msgid "Advanced Options" @@ -193,7 +193,7 @@ msgstr "%sD%sapatkan Jembatan!" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[Ini adalah surel otomatis]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" @@ -210,7 +210,7 @@ msgstr "Anda telah melampaui batas yang ditetapkan. Mohon perlambat! Waktu jeda 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 "Jika jembatan-jembatan ini bukan yang Anda butuhkan, jawab surel ini dengan salah satu perintah berikut di isi pesan:" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -224,7 +224,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stipe dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nsiapapun melihat lalu lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n" +msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stipe dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nsiapapun yang melihat lalu-lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:57 @@ -269,7 +269,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address
[tor-commits] [tor-browser-build/master] Bug 40072: Pick up the dependency changes due to fenix#40001
commit df7f1b01d6ac61df5ed5095243a4eaf9d3d94c63 Author: Georg Koppen Date: Fri Sep 4 19:14:10 2020 + Bug 40072: Pick up the dependency changes due to fenix#40001 --- projects/fenix/config | 2 +- projects/fenix/gradle-dependencies-list.txt | 10 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/fenix/config b/projects/fenix/config index 33d4e44..034714f 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -14,7 +14,7 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 3 + gradle_dependencies_version: 4 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index 4957902..bf237cb 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -565,6 +565,8 @@ fbd052d2d4cd16f707547c468621c6b7fb842c7ec8866d012ecbc6178de1f394 | https://jcent 6f59f847f37a7a052243e97a3b24d6e834833fca3a48d6980f96f7779fe5ff98 | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-agent/1.9.7/byte-buddy-agent-1.9.7.pom 93d9d380779cd1768c52b4bcee82cbfaedef9a4a30de87ae06b441e1634fd38c | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-parent/1.10.9/byte-buddy-parent-1.10.9.pom 259079927014348a555c0969dbae9339c3cc33895a05ffec8e0a25dd50c82278 | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-parent/1.9.7/byte-buddy-parent-1.9.7.pom +ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0.2.jar +3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0.2.pom c83a9c71358d781539c34b38d76a88e3ec8e2d587c7f04b611acc9041919b310 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.aar 0271ae7fc162a5e69c337f36d86fdb94a8a232c5c42a80d8a7424071addd1fdc | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.jar aafe6935d6bedb89a6aa32563d441fbe305da1de193d6f71a45a0212acf9b756 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.pom @@ -868,9 +870,11 @@ d445923ab7dfbb93d086b070b64f07495b0a1804b9ce1f51815d6034c31f781a | https://jcent 9ebcfff0b872eaeeae47b2a9f9653c4e40041193a7c16e6a774f73d79aca8b57 | https://jcenter.bintray.com/org/robolectric/utils/4.3.1/utils-4.3.1.pom 9d7bf2557947d44d6f3ed76ec5231e8b72e33eb61c65ac9e149ad307b0eb936c | https://jcenter.bintray.com/org/robolectric/utils-reflector/4.3.1/utils-reflector-4.3.1.jar a04c2bdefec0b5b492de86365e49537df6d39b04f3823619c94ba2b8937d8670 | https://jcenter.bintray.com/org/robolectric/utils-reflector/4.3.1/utils-reflector-4.3.1.pom -baf3c7fe15fefeaf9e5b000d94547379dc48370f22a8797e239c127e7d7756ec | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.24/slf4j-api-1.7.24.jar -d7a15266d22fadc1c81bbc3b62637801d116e484eb6c831217dc36c537be48d2 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.24/slf4j-api-1.7.24.pom -36367d127a586d502b60bf54db2d7397ec94573620eff523873ec12a12e54839 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.24/slf4j-parent-1.7.24.pom +fbd7b254e02d8aef60c418a5f0e14a783b38a16162caffb2d2a16ccd5d2c09b4 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.7.25.jar +bd9b9cb1a3987b1427f7a18babe7f92078e32bbe2e1dca6dced00cc0e3a077a9 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.7.25.pom +18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar +7cd9d7a0b5d93dfd461a148891b43509cf403a9c7f9fb49060d3554df1c81e1e | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom +18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.25.pom c513995cf019d9213d4fda666589937b2bf1bea5c4cdd337e6170e80b18406ee | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/4/oss-parent-4.pom b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40072'
commit 3aef0b0a63aaab19d2318b17a6973874e06cd842 Merge: 7e49b0e df7f1b0 Author: Matthew Finkel Date: Thu Sep 10 15:15:51 2020 + Merge remote-tracking branch 'gkgl/bug_40072' projects/fenix/config | 2 +- projects/fenix/gradle-dependencies-list.txt | 10 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
commit 414711756a94acd5b11796b7dbdb911edb7e2bab Author: Translation commit bot Date: Thu Sep 10 15:15:05 2020 + https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- id/LC_MESSAGES/bridgedb.po | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 4f97925249..43d553f9b7 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -4,7 +4,7 @@ # # Translators: # anzhyo, 2014 -# Astryd Viandila Dahlan, 2015 +# f952c994a186aafe51026d7b069e8fbe_4f82a74, 2015 # cholif yulian , 2015 # constantius damar wicaksono , 2015 # wongcie , 2015 @@ -16,6 +16,7 @@ # L1Nus , 2014 # Ngalim Siregar , 2015 # km242saya , 2014 +# Ridhwan Ikhwanto, 2020 # Suryadi Harun , 2019 # Wahyu Utomo Nurindrayanto , 2016 # Yerry Borang , 2019 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-09-10 15:14+\n" +"Last-Translator: Ridhwan Ikhwanto\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,7 +82,7 @@ msgstr "Kode Sumber" #: bridgedb/distributors/https/templates/base.html:100 msgid "Changelog" -msgstr "Perubahan" +msgstr "Catatan Perubahan" #: bridgedb/distributors/https/templates/bridges.html:35 msgid "Select All" @@ -93,7 +94,7 @@ msgstr "Tampilkan QRCode" #: bridgedb/distributors/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QRCode untuk bridge Anda" +msgstr "Kode QR untuk jembatan Anda" #: bridgedb/distributors/https/templates/bridges.html:63 msgid "It seems there was an error getting your QRCode." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Check if glob() is available at build-time.
commit 1c4b140427aeb36d80475e92fe57154fcc8abcf3 Author: Alexander Færøy Date: Wed Sep 9 22:08:54 2020 + Check if glob() is available at build-time. This patch disables the glob() support in the path library if glob() is unavailable at build-time. This currently happens with the Android NDK used for Tor Browser. See: https://bugs.torproject.org/tpo/core/tor/40114 --- configure.ac | 2 ++ src/lib/fs/path.c| 15 ++- src/test/test_util.c | 12 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2e1de76606..74f2379fca 100644 --- a/configure.ac +++ b/configure.ac @@ -845,6 +845,8 @@ fi AM_CONDITIONAL(BUILD_READPASSPHRASE_C, test "x$ac_cv_func_readpassphrase" = "xno" && test "$bwin32" = "false") +AC_CHECK_FUNCS(glob) + AC_MSG_CHECKING([whether free(NULL) works]) AC_RUN_IFELSE([AC_LANG_PROGRAM([ #include diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index f03cecf52d..1a15969419 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -532,7 +532,7 @@ unglob_win32(const char *pattern, int prev_sep, int next_sep) tor_free(path_until_glob); return result; } -#else /* !defined(_WIN32) */ +#elif HAVE_GLOB /** Same as opendir but calls sandbox_intern_string before */ static DIR * prot_opendir(const char *name) @@ -559,7 +559,7 @@ wrap_closedir(void *arg) { closedir(arg); } -#endif /* defined(_WIN32) */ +#endif /* defined(HAVE_GLOB) */ /** Return a new list containing the paths that match the pattern * pattern. Return NULL on error. On POSIX systems, errno is set by the @@ -568,14 +568,15 @@ wrap_closedir(void *arg) struct smartlist_t * tor_glob(const char *pattern) { - smartlist_t *result; + smartlist_t *result = NULL; + #ifdef _WIN32 // PathMatchSpec does not support forward slashes, change them to backslashes char *pattern_normalized = tor_strdup(pattern); tor_strreplacechar(pattern_normalized, '/', *PATH_SEPARATOR); result = get_glob_paths(pattern_normalized, unglob_win32, true); tor_free(pattern_normalized); -#else /* !(defined(_WIN32)) */ +#elif HAVE_GLOB /* !(defined(_WIN32)) */ glob_t matches; int flags = GLOB_ERR | GLOB_NOSORT; #ifdef GLOB_ALTDIRFUNC @@ -608,7 +609,11 @@ tor_glob(const char *pattern) smartlist_add(result, match); } globfree(); -#endif /* defined(_WIN32) */ +#else + (void)pattern; + return result; +#endif /* !defined(HAVE_GLOB) */ + return result; } diff --git a/src/test/test_util.c b/src/test/test_util.c index 0e2550d5c5..3ce7103ade 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4440,6 +4440,7 @@ test_util_glob(void *ptr) { (void)ptr; +#ifdef HAVE_GLOB smartlist_t *results = NULL; int r, i; char *dir1 = NULL, *dir2 = NULL, *forbidden = NULL, *dirname = NULL; @@ -4656,6 +4657,11 @@ test_util_glob(void *ptr) SMARTLIST_FOREACH(results, char *, f, tor_free(f)); smartlist_free(results); } +#else + tt_skip(); + done: + return; +#endif } static void @@ -4663,6 +4669,7 @@ test_util_get_glob_opened_files(void *ptr) { (void)ptr; +#ifdef HAVE_GLOB smartlist_t *results = NULL; int r, i; char *dir1 = NULL, *dir2 = NULL, *forbidden = NULL, *dirname = NULL; @@ -4843,6 +4850,11 @@ test_util_get_glob_opened_files(void *ptr) SMARTLIST_FOREACH(results, char *, f, tor_free(f)); smartlist_free(results); } +#else + tt_skip(); + done: + return; +#endif } static void ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
commit 490546e749dccb8aa2d1e5c8cf8aee8c4c54fd44 Author: Translation commit bot Date: Thu Sep 10 13:15:23 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- da/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index 327f85571c..c8b3b30e51 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -47,8 +47,8 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
commit 0a2fb1d66c40323c21165d3495e607d07f565ac5 Author: Translation commit bot Date: Thu Sep 10 13:15:25 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed --- da/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index 52f3f65ede..c8b3b30e51 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -47,6 +47,8 @@ + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
commit f4e3f6862e654fcb34d68cac672a954dcb2d0027 Author: Translation commit bot Date: Thu Sep 10 12:45:25 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed --- fr/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 96403dbb48..80f63deed7 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -47,6 +47,8 @@ + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
commit 9b2363b1e78ee9cc503d335bb52cca63c6baa864 Author: Translation commit bot Date: Thu Sep 10 12:45:22 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- fr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 7162bff6c1..80f63deed7 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -48,7 +48,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
commit 63ccd0bfbb6e88a40f1990907c5fd9084e204263 Author: Translation commit bot Date: Thu Sep 10 10:45:22 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed --- nl/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 49b3cbcecb..e9aa87e593 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -47,6 +47,8 @@ + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
commit c1e077c29e1107c3e94bca33dd4fa0169e589c4c Author: Translation commit bot Date: Thu Sep 10 10:45:20 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- nl/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd index 95aa9a7c43..948306c0ca 100644 --- a/nl/https-everywhere.dtd +++ b/nl/https-everywhere.dtd @@ -47,8 +47,8 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit 378c0cfe82530c50510683050e938bcf53a53379 Author: Translation commit bot Date: Thu Sep 10 10:17:39 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- he.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he.po b/he.po index 4bcfcc71bd..b49f3eb388 100644 --- a/he.po +++ b/he.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-07 14:12+0200\n" -"PO-Revision-Date: 2020-09-08 00:13+\n" +"PO-Revision-Date: 2020-09-10 10:11+\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
commit 064b956277eceee038bbbffd2f6adfac27f095ed Author: Translation commit bot Date: Thu Sep 10 10:16:42 2020 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- he.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/he.po b/he.po index cc36564954..3828e75da1 100644 --- a/he.po +++ b/he.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-07 14:12+0200\n" -"PO-Revision-Date: 2020-09-08 00:13+\n" +"PO-Revision-Date: 2020-09-10 10:11+\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -1129,7 +1129,7 @@ msgstr "××¡× ××¨× ×ת שע×× ××ער×ת" msgid "" "Tor needs an accurate clock to work properly, especially for Onion Services." " Please wait..." -msgstr "" +msgstr "Tor צר×× ×©×¢×× ××××ק ××× ××¢××× ×ר×××, ×××××× ×¢××ר ש×ר××ª× ×צ×. ×× × ××ת×â¦" #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
commit fac1b4d8aba315b180e5f598b4ef7ef8e2e747f3 Author: Translation commit bot Date: Thu Sep 10 10:15:33 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed --- he/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd index ecdaf415f5..72e8fe2d83 100644 --- a/he/https-everywhere.dtd +++ b/he/https-everywhere.dtd @@ -47,6 +47,8 @@ + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
commit 7d13cd877ef31150cee4605bf0278140d60adb9c Author: Translation commit bot Date: Thu Sep 10 10:15:31 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- he/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/https-everywhere.dtd b/he/https-everywhere.dtd index 5b00eb0122..f69f4613be 100644 --- a/he/https-everywhere.dtd +++ b/he/https-everywhere.dtd @@ -48,7 +48,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
commit cf2832c4c12b588aadd5eb6d75a4560d76908866 Author: Translation commit bot Date: Thu Sep 10 08:45:21 2020 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- sq/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sq/https-everywhere.dtd b/sq/https-everywhere.dtd index 4ec8838869..2808d66344 100644 --- a/sq/https-everywhere.dtd +++ b/sq/https-everywhere.dtd @@ -47,8 +47,8 @@ - - + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-81.0b2-10.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
commit 9501a57eaf676c68da9b0997f5cc08c849b5b796 Author: Alex Catarineu Date: Wed Sep 9 13:00:47 2020 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e29c788b720..bac98ce06540 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -286,8 +286,6 @@ pref("extensions.htmlaboutaddons.recommendations.enabled", false); pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbut...@torproject.org"); // Bug 26114: Allow NoScript to access addons.mozilla.org etc. pref("extensions.webextensions.restrictedDomains", ""); -// Bug 31396: Disable indexedDB WebExtension storage backend. -pref("extensions.webextensions.ExtensionStorageIDB.enabled", false); // Bug 28896: Make sure our bundled WebExtensions are running in Private Browsing Mode pref("extensions.allowPrivateBrowsingByDefault", true); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
commit c386fb3312237fd6c0d123ba9aaad662f8740e56 Author: Alex Catarineu Date: Wed Sep 9 13:00:47 2020 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e29c788b720..bac98ce06540 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -286,8 +286,6 @@ pref("extensions.htmlaboutaddons.recommendations.enabled", false); pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbut...@torproject.org"); // Bug 26114: Allow NoScript to access addons.mozilla.org etc. pref("extensions.webextensions.restrictedDomains", ""); -// Bug 31396: Disable indexedDB WebExtension storage backend. -pref("extensions.webextensions.ExtensionStorageIDB.enabled", false); // Bug 28896: Make sure our bundled WebExtensions are running in Private Browsing Mode pref("extensions.allowPrivateBrowsingByDefault", true); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits