December 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.2] Merge branch 'arthuredelstein_18859+1_031' into maint-0.3.2
by nickm＠torproject.org 07 Dec '17

07 Dec '17

commit 4b41ffa64d251268602b06552a53da8cbd60af5c Merge: d4ca18573 13049a986 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 7 08:42:49 2017 -0500 Merge branch 'arthuredelstein_18859+1_031' into maint-0.3.2 changes/bug18859 | 7 +++++++ src/or/circuituse.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/master] Revert accidentally-committed code from 046acf208bc53a3fa7ea9
by nickm＠torproject.org 07 Dec '17

07 Dec '17

commit c2c0f83c23986344c4f3fab033ea1126452f2897 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 7 08:28:57 2017 -0500 Revert accidentally-committed code from 046acf208bc53a3fa7ea9 --- src/or/circuituse.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 497d93923..aa0df9565 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1038,9 +1038,6 @@ circuit_stream_is_being_handled(entry_connection_t *conn, continue; if (origin_circ->unusable_for_new_conns) continue; - if (origin_circ->isolation_values_set && - !connection_edge_compatible_with_circuit(conn, origin_circ)) - continue; exitnode = build_state_get_exit_node(build_state); if (exitnode && (!need_uptime || build_state->need_uptime)) {

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit 7dd39f8db2f91618a61ec39a09aeee301ebf1e68 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 11:46:29 2017 +0000 Update translations for torbirdy_completed --- nb/torbirdy.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd index c5f9673e0..653e5c25e 100644 --- a/nb/torbirdy.dtd +++ b/nb/torbirdy.dtd @@ -38,6 +38,8 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Sett ikke inn mottakers nøkkel ID i krypterte meldinger [default: put]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Skru av krypterte e-posthoder [forvalg: Påskrudd]"> +<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Bekreft før sending av e-post hvis Enigmail er aktivert [forvalg: ikke bekreft]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> <!ENTITY torbirdy.prefs.emailwizard.label "Skru på Thunderbirds automatiske oppsettshjelp [forvalg: avskrudd]">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit 7bf8a57126c4a3c4319ab24041588fc2539996b2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 11:46:19 2017 +0000 Update translations for torbirdy --- nb/torbirdy.dtd | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nb/torbirdy.dtd b/nb/torbirdy.dtd index 118ae1c89..653e5c25e 100644 --- a/nb/torbirdy.dtd +++ b/nb/torbirdy.dtd @@ -38,9 +38,7 @@ <!ENTITY torbirdy.prefs.startup_folder.key "l"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Sett ikke inn mottakers nøkkel ID i krypterte meldinger [default: put]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> -<!ENTITY torbirdy.prefs.enigmail_protected.key "d"> -<!ENTITY torbirdy.prefs.enigmail_protected.label "Disable encrypted email headers [default: enabled]"> +<!ENTITY torbirdy.prefs.enigmail_protected.label "Skru av krypterte e-posthoder [forvalg: Påskrudd]"> <!ENTITY torbirdy.prefs.enigmail_protected.key "d"> <!ENTITY torbirdy.prefs.confirmemail.label "Bekreft før sending av e-post hvis Enigmail er aktivert [forvalg: ikke bekreft]"> <!ENTITY torbirdy.prefs.confirmemail.key "c">

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit a9cf9179b191881aa925425aaf2fb5dfe66be637 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 09:21:52 2017 +0000 Update translations for tails-greeter-2 --- az/az.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/az/az.po b/az/az.po index 6845ac057..348b6c5da 100644 --- a/az/az.po +++ b/az/az.po @@ -43,7 +43,7 @@ msgstr "" #: ../data/greeter.ui.h:6 msgid "Disable" -msgstr "" +msgstr "Söndür" #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:8

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit ad5043cb41c31b4b418a8cbfb448a4f2b84125a9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 08:15:13 2017 +0000 Update translations for bridgedb_completed --- ja/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index 8c75e4d0d..f94609f83 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # brt <87(a)itokei.info>, 2013 # ABE Tsunehiko, 2014-2015 +# azumukupoe <azumukupoe1999(a)gmail.com>, 2017 # タカハシ <indexial(a)outlook.jp>, 2013 # タカハシ <indexial(a)outlook.jp>, 2014 # Masaki Saito <rezoolab(a)gmail.com>, 2013 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-23 18:57+0000\n" -"Last-Translator: ABE Tsunehiko\n" +"PO-Revision-Date: 2017-12-07 07:48+0000\n" +"Last-Translator: azumukupoe <azumukupoe1999(a)gmail.com>\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +38,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "申し訳ありませんが、リクエストに問題がありました。" +msgstr "申し訳ありません！リクエストに問題がありました。" #: bridgedb/https/templates/base.html:79 msgid "Report a Bug"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit 266575804a51b4e84f543a3f4eb5fb8619e66325 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 08:15:06 2017 +0000 Update translations for bridgedb --- ja/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index 8c75e4d0d..f94609f83 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # brt <87(a)itokei.info>, 2013 # ABE Tsunehiko, 2014-2015 +# azumukupoe <azumukupoe1999(a)gmail.com>, 2017 # タカハシ <indexial(a)outlook.jp>, 2013 # タカハシ <indexial(a)outlook.jp>, 2014 # Masaki Saito <rezoolab(a)gmail.com>, 2013 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-09-23 18:57+0000\n" -"Last-Translator: ABE Tsunehiko\n" +"PO-Revision-Date: 2017-12-07 07:48+0000\n" +"Last-Translator: azumukupoe <azumukupoe1999(a)gmail.com>\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +38,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "申し訳ありませんが、リクエストに問題がありました。" +msgstr "申し訳ありません！リクエストに問題がありました。" #: bridgedb/https/templates/base.html:79 msgid "Report a Bug"

1 0

[tor-browser-build/master] Release preparations for 7.5a9 (build4)
by gk＠torproject.org 07 Dec '17

07 Dec '17

commit 66f424078b1971d393406165f79d050e78d574f2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 7 07:51:42 2017 +0000 Release preparations for 7.5a9 (build4) Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index d3cc063..4821baf 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg @@ -28,7 +28,7 @@ targets: torbrowser_update_channel: release nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0 var: torbrowser_update_channel: default diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 57e1338..34947db 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.11.21 +version: 2017.12.6 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c92b0c0..092d36e 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,8 @@ -Tor Browser 7.5a9 -- December 08 2017 +Tor Browser 7.5a9 -- December 09 2017 * All Platforms * Update Firefox to 52.5.2esr * Update Tor to 0.3.2.6-alpha - * Update HTTPS-Everywhere to 2017.11.21 + * Update HTTPS-Everywhere to 2017.12.6 * Update NoScript to 5.1.8.1 * Update sandboxed-tor-browser to 0.0.16 diff --git a/rbm.conf b/rbm.conf index 504c20b..5714e1f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a9' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 7.5a8 project_name: tor-browser

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit 39a50c3040b92eec4401d76975e65324fba9ada6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 07:47:50 2017 +0000 Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd index c02f2c44d..153d1842c 100644 --- a/zh_CN/torbutton.dtd +++ b/zh_CN/torbutton.dtd @@ -27,7 +27,7 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "不保护新的 Cookie"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "该选项用于防止滥用浏览器功能跟踪用户。修改的功能包括：blob 网址，广播通道，浏览器缓存，cookie，收藏夹图标，HTTP 验证头部，预连接，localStorage，mediaSource 网址，OCSP 请求，SharedWorker 和 TLS 会话票证。"> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "该选项用于防止滥用浏览器功能跟踪用户。修改的功能包括：blob 网址，广播通道，浏览器缓存，cookie，收藏夹图标，HTTP 验证标头，预连接，localStorage，mediaSource 网址，OCSP 请求，SharedWorker 和 TLS 会话票证。"> <!ENTITY torbutton.prefs.resist_fingerprinting "修改 Tor 浏览器中可区分你与其他 Tor 用户的细节信息"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "勾选此选项以避免网站获取您的浏览器指纹信息，包括您的计算机性能、键盘布局、系统语言、安装插件的位置、已安装插件列表、您的网络状态、屏幕方向、屏幕尺寸、特定网站缩放级别、支持的文件类型、系统颜色、WebGL 功能。">

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit 4de1ebb4f97b74806f93bad1b75ee43f730a9c14 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 07:45:26 2017 +0000 Update translations for whisperback --- bn/bn.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bn/bn.po b/bn/bn.po index 393894fb4..fca6ac988 100644 --- a/bn/bn.po +++ b/bn/bn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-26 15:01+0000\n" +"PO-Revision-Date: 2017-12-07 07:36+0000\n" "Last-Translator: Mahmud Numan <mahmudnuman(a)gmail.com>\n" "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n" "MIME-Version: 1.0\n" @@ -212,4 +212,4 @@ msgstr "Help" #: ../data/whisperback.ui.h:30 msgid "Send" -msgstr "" +msgstr "পাঠান"

1 0