January 2018 - tor-commits - lists.torproject.org

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 16 Jan '18

16 Jan '18

commit 7dca6f0155483104e690195a827d5fc16b3530e4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 16 16:15:24 2018 +0000 Update translations for whisperback --- ms_MY/ms_MY.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY/ms_MY.po b/ms_MY/ms_MY.po index 3194c30f0..9bbefaf0a 100644 --- a/ms_MY/ms_MY.po +++ b/ms_MY/ms_MY.po @@ -10,7 +10,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-12-06 15:16+0000\n" +"PO-Revision-Date: 2018-01-16 16:06+0000\n" "Last-Translator: abuyop <abuyop(a)gmail.com>\n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 16 Jan '18

16 Jan '18

commit 2ae4a4d37111062dcbb7920a6f735c55e550cac3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 16 15:19:38 2018 +0000 Update translations for tor-messenger-otrproperties --- is/otr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/otr.properties b/is/otr.properties index c672ad7e8..a5db6b0fd 100644 --- a/is/otr.properties +++ b/is/otr.properties @@ -1,4 +1,4 @@ -msgevent.encryption_required_part1=You attempted to send an unencrypted message to %S. As a policy, unencrypted messages are not allowed. +msgevent.encryption_required_part1=Þú reyndir að senda ódulritað skeyti til %S. Stefnan er að leyfa ekki ódulrituð skilaboð. msgevent.encryption_required_part2=Attempting to start a private conversation. Your message will be retransmitted when the private conversation starts. msgevent.encryption_error=Villa kom upp við að dulrita skilaboðin þín. Þau voru því ekki send. msgevent.connection_ended=%S has already closed their private connection to you. Your message was not sent. Either end your private conversation, or restart it.

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 16 Jan '18

16 Jan '18

commit 1120852094281df827481363ea48b1d452f3003e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 16 14:49:42 2018 +0000 Update translations for tor-messenger-otrproperties --- is/otr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/is/otr.properties b/is/otr.properties index aade3d0c3..c672ad7e8 100644 --- a/is/otr.properties +++ b/is/otr.properties @@ -1,6 +1,6 @@ msgevent.encryption_required_part1=You attempted to send an unencrypted message to %S. As a policy, unencrypted messages are not allowed. msgevent.encryption_required_part2=Attempting to start a private conversation. Your message will be retransmitted when the private conversation starts. -msgevent.encryption_error=An error occurred when encrypting your message. The message was not sent. +msgevent.encryption_error=Villa kom upp við að dulrita skilaboðin þín. Þau voru því ekki send. msgevent.connection_ended=%S has already closed their private connection to you. Your message was not sent. Either end your private conversation, or restart it. msgevent.setup_error=Villa kom upp við að setja upp einkaspjall við %S. msgevent.msg_reflected=You are receiving your own OTR messages. You are either trying to talk to yourself, or someone is reflecting your messages back at you. @@ -18,7 +18,7 @@ context.gone_secure_private=Einkaspjall við %S hófst. context.gone_secure_unverified=Einkaspjall við %S hófst. Hinsvegar er ekki búið að sannreyna auðkenni þeirra. context.still_secure=Tókst að endurlesa einkaspjall við %S. error.enc=Villa kom upp við að dulrita skilaboð. -error.not_priv=You sent encrypted data to %S, who wasn't expecting it. +error.not_priv=Þú sendir dulrituð gögn til %S, sem átti ekki von á því. error.unreadable=Þú sendir ólesanleg dulrituð skilaboð. error.malformed=Þú sendir skilaboð með gölluðum gögnum. resent=[sent aftur]

1 0

[translation/tor-messenger-fingerdtd_completed] Update translations for tor-messenger-fingerdtd_completed
by translation＠torproject.org 16 Jan '18

16 Jan '18

commit c78ee80b8dcdf87a0f36b1f5f8bfb18ade37119d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 16 14:49:37 2018 +0000 Update translations for tor-messenger-fingerdtd_completed --- is/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/finger.dtd b/is/finger.dtd index 888aaade7..55b3c2dbd 100644 --- a/is/finger.dtd +++ b/is/finger.dtd @@ -12,4 +12,4 @@ <!ENTITY addFingerDialog.finger "Fingrafar"> <!ENTITY addFingerDialog.accept "Í lagi"> <!ENTITY addFingerDialog.cancel "Sleppa"> -<!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file +<!ENTITY addFingerDialog.tooltip "Ef þú ert með fingrafarið af 40 hex-stafa OTR-einkalykli tengiliðarins þíns, settu það inn núna."> \ No newline at end of file

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 16 Jan '18

16 Jan '18

commit dd50d395f5e63358d95614a7befad2a71c429d6d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 16 14:49:29 2018 +0000 Update translations for tor-messenger-fingerdtd --- is/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/finger.dtd b/is/finger.dtd index 888aaade7..55b3c2dbd 100644 --- a/is/finger.dtd +++ b/is/finger.dtd @@ -12,4 +12,4 @@ <!ENTITY addFingerDialog.finger "Fingrafar"> <!ENTITY addFingerDialog.accept "Í lagi"> <!ENTITY addFingerDialog.cancel "Sleppa"> -<!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file +<!ENTITY addFingerDialog.tooltip "Ef þú ert með fingrafarið af 40 hex-stafa OTR-einkalykli tengiliðarins þíns, settu það inn núna."> \ No newline at end of file

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 16 Jan '18

16 Jan '18

commit 63d85e431ab8205a18bf95b7373d7c04bfa9bfad Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 16 14:20:40 2018 +0000 Update translations for exoneratorproperties --- is/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/exonerator.properties b/is/exonerator.properties index 012fb92ea..3598d01f3 100644 --- a/is/exonerator.properties +++ b/is/exonerator.properties @@ -19,7 +19,7 @@ summary.invalidparams.invalidip.title=Ógild færsla IP-tölu summary.invalidparams.invalidip.body=Því miður, %s er ekki gilt IP-vistfang. Vænst er IP-vistfanga á sniðunum %s eða %s. summary.invalidparams.invalidtimestamp.title=Ógild dagsetningarfærsla summary.invalidparams.invalidtimestamp.body=Því miður, %s er ekki gild dagsetning. Vænst er dagsetninga á sniðinu %s. -summary.invalidparams.timestamptoorecent.title=Date parameter too recent +summary.invalidparams.timestamptoorecent.title=Dagsetningarfærsla of nýleg summary.invalidparams.timestamptoorecent.body=The database may not yet contain enough data to correctly answer this request. The latest accepted data is the day before yesterday. Please repeat your search on another day. summary.serverproblem.nodata.title=Vandamál í þjóni summary.serverproblem.nodata.body.text=Því miður, gagnagrunnurinn inniheldur engin gögn frá umbeðinni dagsetningu. Reyndu aftur síðar. Ef vandamálið heldur áfram, %s!

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 16 Jan '18

16 Jan '18

commit 3b4a462f3a1786053cc44c0352a82e494e1d9f0a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 16 14:17:04 2018 +0000 Update translations for tor-launcher-network-settings_completed --- zh_TW/network-settings.dtd | 61 +++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd index 5e6d31e1d..3de752f3c 100644 --- a/zh_TW/network-settings.dtd +++ b/zh_TW/network-settings.dtd @@ -1,4 +1,7 @@ <!ENTITY torsettings.dialog.title "洋蔥路由網路設定"> +<!ENTITY torsettings.wizard.title.default "連結 Tor"> +<!ENTITY torsettings.wizard.title.configure "Tor 網路設定"> +<!ENTITY torsettings.wizard.title.connecting "建立 Tor 連線">  <!ENTITY torlauncher.localePicker.title "洋蔥路由瀏覽器之語言"> @@ -6,31 +9,11 @@  -<!ENTITY torsettings.prompt "在您連接到洋蔥路由網路前，您需要提供這台電腦網路連線的相關資訊。"> - -<!ENTITY torSettings.yes "是"> -<!ENTITY torSettings.no "否"> - -<!ENTITY torSettings.firstQuestion "下列哪一項敘述最符合您的實際情況？"> -<!ENTITY torSettings.configurePrompt1 "這部電腦的網路連線有被監控過濾或是有透過代理伺服器。"> -<!ENTITY torSettings.configurePrompt2 "我必須要在連上洋蔥路由 網路之前，先設定好橋接器或本地端代理伺服器。"> +<!ENTITY torSettings.connectPrompt "點擊"連接"來連上 Tor "> +<!ENTITY torSettings.configurePrompt "如果您處於會監視tor網絡的國家（例如埃及，中國，土耳其）或者您位於私人網絡中，需要代理訪問互聯網。請點擊“配置”更改網絡設置。"> <!ENTITY torSettings.configure "設定"> -<!ENTITY torSettings.connectPrompt2 "我想要直接連上洋蔥路由網路。"> -<!ENTITY torSettings.connectPrompt3 "這將在大多數情況下正常運作。"> <!ENTITY torSettings.connect "連接"> -<!ENTITY torSettings.proxyPageTitle "本地端代理伺服器的設定"> -<!ENTITY torSettings.proxyQuestion "這台電腦需要使用本地代理伺服器來存取網路嗎？"> - -<!ENTITY torSettings.proxyExplanation1 "在大部分的情況中是不需要本地端代理伺服器的，但是當所使用的網路服務是公司企業或學校等之內部網路時，就有可能會需要。"> -<!ENTITY torSettings.proxyExplanation2 "如果您不確定如何回答這個問題的話，可以參考其他網路瀏覽器的網際網路設定或者是作業系統中的網路相關設定，以確定是否需要設定本地端代理伺服器。"> -<!ENTITY torSettings.enterProxy "輸入代理伺服器設定。"> -<!ENTITY torSettings.bridgePageTitle "洋蔥路由橋接器的設定"> -<!ENTITY torSettings.bridgeQuestion "您的網際網路服務提供者(ISP)是否會阻擋或監控過濾連接到洋蔥路由的網路活動？"> -<!ENTITY torSettings.bridgeExplanation1 "若您不確定如何回答這個問題的話，請選擇「否」(若之後您發現沒有使用橋接器無法連上洋蔥路由網路的話，可以再回頭來增加此設定)。"> -<!ENTITY torSettings.bridgeExplanation2 "若您選擇「是」的話，您將必須要進行洋蔥路由的橋接器設定，橋接器是未被列表的祕密洋蔥路由節點，它可以讓對通往洋蔥路由網路連線的阻擋，變得更加困難。"> -<!ENTITY torSettings.bridgeSettingsPrompt "您可以使用提供的橋接器，您也可以輸入一組自訂的橋接器。"> -  <!ENTITY torsettings.startingTor "正在等待洋蔥路由啟動…"> @@ -42,8 +25,9 @@ <!ENTITY torsettings.optional "選用"> -<!ENTITY torsettings.useProxy.checkbox "這台電腦需要透過代理伺服器存取網際網路"> +<!ENTITY torsettings.useProxy.checkbox "使用代理服務連線到網際網路"> <!ENTITY torsettings.useProxy.type "代理伺服器類型："> +<!ENTITY torsettings.useProxy.type.placeholder "選擇代理伺服器類型"> <!ENTITY torsettings.useProxy.address "位址："> <!ENTITY torsettings.useProxy.address.placeholder "IP 位址或主機名稱"> <!ENTITY torsettings.useProxy.port "連接埠："> @@ -54,22 +38,21 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "這台電腦通過某個只允許連接至特定連線埠的防火牆"> <!ENTITY torsettings.firewall.allowedPorts "允許的連接埠："> -<!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)會過濾阻擋連接至洋蔥路由的網路活動"> -<!ENTITY torsettings.useBridges.default "使用提供的橋接器連線"> -<!ENTITY torsettings.useBridges.note "每種橋接器都使用不同的方式去規避網路封包過濾，  如果發現使用了某個橋接器仍然無法順利連上線的話，可以更換另一個橋接器再行嘗試。"> -<!ENTITY torsettings.useBridges.type "傳輸類型："> -<!ENTITY torsettings.useBridges.custom "輸入自訂的橋接器"> -<!ENTITY torsettings.useBridges.label "輸入一個或多個橋接中繼器 (每行一個)。"> -<!ENTITY torsettings.useBridges.placeholder "請輸入位址:連接埠"> +<!ENTITY torsettings.useBridges.checkbox "我的國家中 Tor 受到審查"> +<!ENTITY torsettings.useBridges.default "選擇內建的橋接"> +<!ENTITY torsettings.useBridges.default.placeholder "選擇網橋"> +<!ENTITY torsettings.useBridges.custom "提供一個認識的橋接 "> +<!ENTITY torsettings.useBridges.label "從信任的來源輸入橋接資訊"> +<!ENTITY torsettings.useBridges.placeholder "種類地址:端口 (一行一個)"> <!ENTITY torsettings.copyLog "將洋蔥路由的訊息記錄複製到剪貼簿"> + +<!ENTITY torsettings.proxyHelpTitle "代理協助"> +<!ENTITY torsettings.proxyHelp1 "當您通過公司，學校或者大學網絡進行連接時，您需要一個本地代理。如果您不確定如何回答這個問題，請參考其他瀏覽器的網絡設置或者系統網絡設置，來決定是否需要本地代理。"> + <!ENTITY torsettings.bridgeHelpTitle "橋接中繼器之說明"> -<!ENTITY torsettings.bridgeHelp1 "若您無法連接到洋蔥路由網路，可能是因為您的網際網路服務提供者 (ISP) 或其它機構正在封鎖洋蔥路由網路。  通常您可以使用橋接中繼器來連上洋蔥路由網路，以便解決此問題。該種中繼器是未被羅列於清單中的秘密中繼節點，非常難以被過濾阻擋。"> -<!ENTITY torsettings.bridgeHelp1B "您可以使用我們所提供的預設橋接器位址組合，或者也可以由以下的方法取得客製化的橋接器位址組合："> -<!ENTITY torsettings.bridgeHelp2Heading "透過網路"> -<!ENTITY torsettings.bridgeHelp2 "使用網路瀏覽器造訪 https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "透過電子郵件自動回覆"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "傳送郵件到 bridges(a)torproject.org 並在內文中輸入「get bridges」字串。  然而，要使得網路攻擊者更難取得橋接器位址，您必須是使用以下電子郵件提供者之一來寄送本要求 (列表順序是依照優先偏好)："> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com 或者 https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "透過服務台"> -<!ENTITY torsettings.bridgeHelp4 "最後的方法是：您可以發送一封禮貌性的郵件到 help(a)rt.torproject.org.  請注意，對於此類郵件我們必需要一封封地手動回覆。"> +<!ENTITY torsettings.bridgeHelp1 "網橋是未位於列表的中繼，可以使得tor網絡更難被屏蔽。 不同類別的網橋使用不同方法規避審查。.  obfs使您的通訊類似隨機發出的雜音，meek使您的通訊看起來是訪問他們的服務而不是tor。"> +<!ENTITY torsettings.bridgeHelp2 "因為某些國家嘗試屏蔽tor，一些特定的網橋只能在特定的國家生效在其他地區則會失活。 如果您不確定哪些網橋在您的國家生效，請訪問torproj…"> + + +<!ENTITY torprogress.pleaseWait "請耐心等候，我們正在建立tor網絡。 這個過程將會需要幾分鐘的時間。">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 16 Jan '18

16 Jan '18

commit c7923f67d03b563f07e640538cb5a1fd8403297b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 16 14:16:58 2018 +0000 Update translations for tor-launcher-network-settings --- zh_TW/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd index 43dad86f3..3de752f3c 100644 --- a/zh_TW/network-settings.dtd +++ b/zh_TW/network-settings.dtd @@ -48,11 +48,11 @@ <!ENTITY torsettings.copyLog "將洋蔥路由的訊息記錄複製到剪貼簿"> <!ENTITY torsettings.proxyHelpTitle "代理協助"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelp1 "當您通過公司，學校或者大學網絡進行連接時，您需要一個本地代理。如果您不確定如何回答這個問題，請參考其他瀏覽器的網絡設置或者系統網絡設置，來決定是否需要本地代理。"> <!ENTITY torsettings.bridgeHelpTitle "橋接中繼器之說明"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> +<!ENTITY torsettings.bridgeHelp1 "網橋是未位於列表的中繼，可以使得tor網絡更難被屏蔽。 不同類別的網橋使用不同方法規避審查。.  obfs使您的通訊類似隨機發出的雜音，meek使您的通訊看起來是訪問他們的服務而不是tor。"> +<!ENTITY torsettings.bridgeHelp2 "因為某些國家嘗試屏蔽tor，一些特定的網橋只能在特定的國家生效在其他地區則會失活。 如果您不確定哪些網橋在您的國家生效，請訪問torproj…">  -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> +<!ENTITY torprogress.pleaseWait "請耐心等候，我們正在建立tor網絡。 這個過程將會需要幾分鐘的時間。">

1 0

[tor-browser-build/master] Bug 24912: Don't build snowflake on the stable series yet
by gk＠torproject.org 16 Jan '18

16 Jan '18

commit ba6ac61ef5a80eaf53dcc4f4b9622d2b9e12a9bb Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 16 12:06:04 2018 +0000 Bug 24912: Don't build snowflake on the stable series yet --- projects/tor-browser/build | 11 +++++++++-- rbm.conf | 10 ++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index e87ef11..bfa250a 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -123,7 +123,12 @@ tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/os cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults [% IF c("var/linux") -%] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH + [% IF ! c("var/snowflake") %] + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ + >> $TBDIR/$EXTOVERRIDESPATH + [% ELSE %] + cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH + [% END %] [% END -%] [% IF c("var/windows") -%] # We don't have snowflake available on Windows yet @@ -134,7 +139,9 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TB [% END -%] [% IF c("var/osx") -%] # FTE is temporarily removed due to bug 18495. - grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH + grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \ + [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \ + >> $TBDIR/$EXTOVERRIDESPATH [% END -%] cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js diff --git a/rbm.conf b/rbm.conf index ed2319d..95b7447 100644 --- a/rbm.conf +++ b/rbm.conf @@ -162,8 +162,9 @@ targets: var: linux: 1 compiler: gcc - # We only build snowflake on linux and osx for now - snowflake: 1 + # We only build snowflake for linux and osx on the alpha and nightly + # channels for now. + snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 container: suite: wheezy @@ -269,8 +270,9 @@ targets: FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac - # We only build snowflake on linux and osx for now - snowflake: 1 + # We only build snowflake for linux and osx on the alpha and nightly + # channels for now. + snowflake: '[% c("var/alpha") || c("var/nightly") %]' deps: - build-essential - python

1 0

[tor-browser-build/master] Bug 24912: Disable selfrando on stable series
by gk＠torproject.org 16 Jan '18

16 Jan '18

commit a1347df3ca9d094b53c2aee516a7c96111422d12 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 16 13:15:54 2018 +0000 Bug 24912: Disable selfrando on stable series --- projects/binutils/build | 2 +- projects/firefox/build | 2 +- projects/firefox/config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index 6d8e0b2..aa0d752 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -29,7 +29,7 @@ cd [% project %]-[% c("version") %] [% IF c('var/windows-x86_64') -%] patch -p1 < ../64bit-fixups.patch [% END -%] -[% IF c("var/linux") -%] +[% IF c("var/linux") && ! c("var/release") -%] # We need to work around a gold linker bug in 2.24 to get selfrando working, # see bug 20683. patch -p1 < $rootdir/binutils-224-gold.patch diff --git a/projects/firefox/build b/projects/firefox/build index ed559b0..81d4d1c 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -27,7 +27,7 @@ mkdir -p /var/tmp/build export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] -[% IF c("var/linux") -%] +[% IF c("var/linux") && ! c("var/release") -%] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] # Selfrando wrapper export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" diff --git a/projects/firefox/config b/projects/firefox/config index 182b6b5..59a4418 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -82,7 +82,7 @@ input_files: enable: '[% c("var/linux") %]' - project: selfrando name: selfrando - enable: '[% c("var/linux") %]' + enable: '[% c("var/linux") && ! c("var/release") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll

1 0