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

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 23 May '14

23 May '14

commit 46c7182432cd4a69b9c264ed20debd9bbcefdb6d Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 23 12:15:54 2014 +0000 Update translations for tor-and-https --- ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru.po b/ru.po index 5f2c06f..4d1c364 100644 --- a/ru.po +++ b/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-21 09:17+0200\n" -"PO-Revision-Date: 2014-05-23 05:18+0000\n" +"PO-Revision-Date: 2014-05-23 12:05+0000\n" "Last-Translator: tukos\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 23 May '14

23 May '14

commit ae12d7df575f6a8b5fd877a3bd31018802df4f13 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 23 12:15:03 2014 +0000 Update translations for bridgedb --- pl/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po index 6cbaa2f..b26d90c 100644 --- a/pl/LC_MESSAGES/bridgedb.po +++ b/pl/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ 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: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-23 07:14+0000\n" +"PO-Revision-Date: 2014-05-23 12:07+0000\n" "Last-Translator: maxxx <maxxxrally(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" @@ -223,7 +223,7 @@ msgstr "Wyświetla tę wiadomość." #: lib/bridgedb/strings.py:123 msgid "Request vanilla bridges." -msgstr "Zapytanie mostka 'vanilla'." +msgstr "Zapytanie mostków 'vanilla'." #: lib/bridgedb/strings.py:124 msgid "Request IPv6 bridges."

1 0

[tor-browser-bundle/master] Update bug11156 patch with fix from #11654.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit fcd3be303a9786574c42635e124d294e7abf77c4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 08:16:07 2014 -0700 Update bug11156 patch with fix from #11654. --- gitian/patches/bug11156.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gitian/patches/bug11156.patch b/gitian/patches/bug11156.patch index 33dacad..d9f8e7a 100644 --- a/gitian/patches/bug11156.patch +++ b/gitian/patches/bug11156.patch @@ -249,3 +249,27 @@ index c2d6545..551b09f 100644 -- 1.8.1.2 +From dfcbc4500aad07a641e9e856d442c848d86d2c7e Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Thu, 1 May 2014 17:32:29 +0100 +Subject: [PATCH] fixup! Fix a misuse of strlcpy() introduced by the #11156 + patch. + +--- + changes/bug11654 | 4 ++++ + 1 file changed, 4 insertions(+) + create mode 100644 changes/bug11654 + +diff --git a/changes/bug11654 b/changes/bug11654 +new file mode 100644 +index 0000000..97c70b2 +--- /dev/null ++++ b/changes/bug11654 +@@ -0,0 +1,4 @@ ++ o Minor bugfixes: ++ - Fix a broken log message about delayed directory fetches that ++ was caused by a misuse of strlcpy(). Fixes bug 11654; bugfix on ++ 0.2.5.3-alpha. +-- +1.9.1 +

1 0

[tor-browser-bundle/master] Increase some component versions for 3.6.2.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit b428d32a7f014d53235750ec2a1634c6937fd5ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 08:33:46 2014 -0700 Increase some component versions for 3.6.2. We may also bump torbutton and tor launcher later. --- gitian/versions | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions b/gitian/versions index a9e033f..6424316 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.1 +TORBROWSER_VERSION=3.6.2pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -7,10 +7,10 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 -TOR_TAG=tor-0.2.4.21 +TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -18,8 +18,8 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 -LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 -FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # tag 0.2.14 +LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 +FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2

1 0

[tor-browser-bundle/master] Add support for scramblesuit, add in default bridge lines.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit ef80bcdfd15ba873de6c7a88382176b893770638 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 08:20:27 2014 -0700 Add support for scramblesuit, add in default bridge lines. --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++++ Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f14cf07..8d2afed 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -21,3 +21,7 @@ pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); + +pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); +pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); +pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 87108bd..8327587 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -2,7 +2,7 @@ ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy.bin --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec ./Tor/PluggableTransports/obfsproxy.bin managed ## flash proxy configuration # # Change the second number here (9000) to the number of a port that can diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 7c6e6a5..19fc8e0 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -2,7 +2,7 @@ ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec PluggableTransports/obfsproxy.bin managed ## flash proxy configuration # diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index 049d2ff..bc1399d 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -2,7 +2,7 @@ ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec Tor\PluggableTransports\obfsproxy managed ## flash proxy configuration #

1 0

[tor-browser-bundle/master] Bug 9229 was merged in Tor 0.2.4.22. Remove our backport patch.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit cc1cff02f7c8b930bdcf03abc1a3a1cd5800d427 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 09:13:24 2014 -0700 Bug 9229 was merged in Tor 0.2.4.22. Remove our backport patch. --- gitian/descriptors/linux/gitian-tor.yml | 2 -- gitian/descriptors/mac/gitian-tor.yml | 2 -- gitian/descriptors/windows/gitian-tor.yml | 2 -- gitian/patches/bug9229.patch | 46 ----------------------------- 4 files changed, 52 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 4a8f08e..2b0b9ab 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -24,7 +24,6 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" -- "bug9229.patch" - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" @@ -75,7 +74,6 @@ script: | if [ $BUILD_PT_BUNDLES ]; then if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 90f56e0..be4edd2 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -21,7 +21,6 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" -- "bug9229.patch" - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" @@ -70,7 +69,6 @@ script: | if [ $BUILD_PT_BUNDLES ]; then if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 19c4acd..d3f1d4e 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -22,7 +22,6 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" -- "bug9229.patch" - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" @@ -72,7 +71,6 @@ script: | if [ $BUILD_PT_BUNDLES ]; then if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/patches/bug9229.patch b/gitian/patches/bug9229.patch deleted file mode 100644 index 6b1115c..0000000 --- a/gitian/patches/bug9229.patch +++ /dev/null @@ -1,46 +0,0 @@ -From db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 Mon Sep 17 00:00:00 2001 -From: Nick Mathewson <nickm(a)torproject.org> -Date: Mon, 10 Mar 2014 15:01:27 -0400 -Subject: [PATCH] Update ns downloads when we receive a bridge descriptor - -This prevents long stalls when we're starting with a state file but -with no bridge descriptors. Fixes bug 9229. I believe this bug has -been present since 0.2.0.3-alpha. ---- - changes/bug9229 | 5 +++++ - src/or/entrynodes.c | 6 +++++- - 2 files changed, 10 insertions(+), 1 deletion(-) - create mode 100644 changes/bug9229 - -diff --git a/changes/bug9229 b/changes/bug9229 -new file mode 100644 -index 0000000..ad7fd22 ---- /dev/null -+++ b/changes/bug9229 -@@ -0,0 +1,5 @@ -+ o Minor bugfixes: -+ - Avoid 60-second delays in the bootstrapping process when Tor -+ is launching for a second time while using bridges. Fixes bug 9229; -+ bugfix on 0.2.0.3-alpha. -+ -diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c -index 2aa063c..59770fa 100644 ---- a/src/or/entrynodes.c -+++ b/src/or/entrynodes.c -@@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) - * our entry node list */ - entry_guard_register_connect_status(ri->cache_info.identity_digest, - 1, 0, now); -- if (first) -+ if (first) { -+ /* XXXX apparently, this is never called. See bug #9229. */ - routerlist_retry_directory_downloads(now); -+ } -+ -+ update_networkstatus_downloads(now); - } - } - } --- -1.8.1.2 -

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 23 May '14

23 May '14

commit efd254eab6827b7c46a04c010483bb5e86444052 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 23 11:45:21 2014 +0000 Update translations for liveusb-creator_completed --- nb/nb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/nb.po b/nb/nb.po index fe31a7c..c005224 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-16 18:47+0200\n" -"PO-Revision-Date: 2014-05-23 09:25+0000\n" +"PO-Revision-Date: 2014-05-23 11:34+0000\n" "Last-Translator: kingu <comradekingu(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 May '14

23 May '14

commit 441e2dc3e452b878a4944c729c0fd5102753d3db Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 23 11:45:18 2014 +0000 Update translations for liveusb-creator --- nb/nb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/nb.po b/nb/nb.po index fe31a7c..c005224 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-16 18:47+0200\n" -"PO-Revision-Date: 2014-05-23 09:25+0000\n" +"PO-Revision-Date: 2014-05-23 11:34+0000\n" "Last-Translator: kingu <comradekingu(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 23 May '14

23 May '14

commit 3ffa3bd0a7bef165e198aa8413e43ce8cc60497b Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 23 11:45:03 2014 +0000 Update translations for bridgedb --- nb/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po index 0d1e87d..b09f9d0 100644 --- a/nb/LC_MESSAGES/bridgedb.po +++ b/nb/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ 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: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-23 03:02+0000\n" +"PO-Revision-Date: 2014-05-23 11:34+0000\n" "Last-Translator: kingu <comradekingu(a)gmail.com>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 23 May '14

23 May '14

commit ede9927c98b4cb7b11fac84ba67dbdc3e2cf209d Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 23 11:15:14 2014 +0000 Update translations for torcheck_completed --- es/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/torcheck.po b/es/torcheck.po index dc8962f..9ea6583 100644 --- a/es/torcheck.po +++ b/es/torcheck.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-22 21:08+0000\n" +"PO-Revision-Date: 2014-05-23 11:11+0000\n" "Last-Translator: alexiulacio <alexi.ulacio(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0