- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-31.4.0esr-4.5-1] Merge remote-tracking branch 'brade/bug13900-01' into tor-browser-31.4.0esr-4.5-1
by mikeperry＠torproject.org 13 Feb '15

13 Feb '15

commit feb32165494be68c1d29a48ef9d4d9cf8b0b36ed Merge: 2183169 b6be541 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 12 18:01:12 2015 -0800 Merge remote-tracking branch 'brade/bug13900-01' into tor-browser-31.4.0esr-4.5-1 content/base/src/ThirdPartyUtil.cpp | 21 ++++++--- netwerk/base/public/mozIThirdPartyUtil.idl | 22 ++++++++- netwerk/protocol/http/nsHttpChannel.cpp | 70 ++++++++++++++++++++++++++++ netwerk/protocol/http/nsHttpChannel.h | 1 + 4 files changed, 107 insertions(+), 7 deletions(-)

1 0

[torbutton/master] Bug 14490: Make disconnect search the default search engine.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 699f82654904841df2691fe020928933afe312ff Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:57:08 2015 -0800 Bug 14490: Make disconnect search the default search engine. --- src/chrome/content/aboutTor/aboutTor.xhtml | 8 ++++---- src/chrome/locale/en/aboutTor.dtd | 1 + src/chrome/locale/en/aboutTor.properties | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 9b77af2..95807fd 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -112,9 +112,9 @@ function insertPropertyStrings() Components.utils.import("resource://gre/modules/Services.jsm"); var gStringBundle = Services.strings.createBundle(kPropertiesURL); - var s1 = gStringBundle.GetStringFromName("aboutTor.searchSP.privacy.link"); - var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link"); - var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy", + var s1 = gStringBundle.GetStringFromName("aboutTor.searchDC.privacy.link"); + var s2 = gStringBundle.GetStringFromName("aboutTor.searchDC.search.link"); + var result = gStringBundle.formatStringFromName("aboutTor.searchDC.privacy", [s1, s2], 2); if (result) { var elem = document.getElementById("searchProviderInfo"); @@ -165,7 +165,7 @@ window.addEventListener("pageshow", function() { </div> <div class="searchbox hideIfTorOff">  - <form action="&aboutTor.searchSPPost.link;" method="post"> + <form action="&aboutTor.searchDCPost.link;" method="post"> <div id="sxw"> <div id="sbutton"> <input name="b" id="sb" value="" title="&aboutTor.search.label;" diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 6f63ff7..771f8ae 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -25,6 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index 02088f0..d607324 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -13,3 +13,9 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/

1 0

[torbutton/master] fixup! Bug 9387: Bind jar: pref to security slider
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 1e727db8e063928d48d1bfbcdedd7bc7f64295f1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:54:29 2015 -0800 fixup! Bug 9387: Bind jar: pref to security slider Fix a missing :. --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 752206e..2fa7189 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2161,7 +2161,7 @@ var torbutton_sec_ml_bool_prefs = { "javascript.options.asmjs" : false, "noscript.forbidMedia" : true, "media.webaudio.enabled" : false, - "network.jar.block-remote-files", true, + "network.jar.block-remote-files" : true, // XXX: pref for disabling MathML is missing };

1 0

[torbutton/master] Bug 11236: Don't set search engines in extension
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 4c35e375ff74614b84ff722e9214d757fed07b01 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 23 12:09:45 2015 +0000 Bug 11236: Don't set search engines in extension We risk search engine names getting translated which results in broken search boxes if we expose them in locale files. As we only use en-US search engines (i.e. no localized ones) we can avoid that risk by removing these language strings and adding the search engines names directly into a central preference file shared by all localized bundles. --- src/chrome/locale/en/browser.properties | 8 -------- src/defaults/preferences/preferences.js | 6 +----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/chrome/locale/en/browser.properties b/src/chrome/locale/en/browser.properties index 295a03a..8849b67 100644 --- a/src/chrome/locale/en/browser.properties +++ b/src/chrome/locale/en/browser.properties @@ -3,11 +3,3 @@ browser.startup.homepage=about:tor # Spell checker dictionary spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 3e02b77..c6fb8e4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -225,10 +225,6 @@ pref("extensions.torbutton.cookie_js_allow", true); pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true); -// Browser home page, spell checker dictionary, and search engine overrides: +// Browser home page, and spell checker dictionary: pref("browser.startup.homepage", "chrome://torbutton/locale/browser.properties"); pref("spellchecker.dictionary", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.defaultenginename", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.1", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.2", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.3", "chrome://torbutton/locale/browser.properties");

1 0

[torbutton/master] Bug 14392: Make about:tor behave like other initial pages.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 4d194b2b827b65f357f6c0a9e02ac719bad86afc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:46:10 2015 -0800 Bug 14392: Make about:tor behave like other initial pages. In particular: Don't steal focus from the URL bar. --- src/chrome/content/aboutTor/aboutTor.xhtml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index c13f60e..9b77af2 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -33,7 +33,6 @@ function onLoad() window.setTimeout( function() { adjustToolbarIconArrow(); - document.getElementById('sx').focus(); }, 0); }

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug 14392: Make about:tor behave like other initial pages.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 573a734b7b15d68672724403ab23dd23531bfdae Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:45:24 2015 -0800 Bug 14392: Make about:tor behave like other initial pages. --- browser/base/content/browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 05bea9d..1384e66 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -159,6 +159,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "TabCrashReporter", #endif let gInitialPages = [ + "about:tor", "about:blank", "about:newtab", "about:home",

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Omnibox: Add disconnect, youtube; remove Amazon and eBay
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 43f9335cb0e47d104340faf8a535db754a4d73f0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 15:33:35 2015 -0800 Omnibox: Add disconnect, youtube; remove Amazon and eBay eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. --- browser/locales/en-US/searchplugins/bing.xml | 6 +++--- browser/locales/en-US/searchplugins/disconnect.xml | 10 ++++++++++ browser/locales/en-US/searchplugins/list.txt | 12 ++++++------ browser/locales/en-US/searchplugins/youtube.xml | 10 ++++++++++ 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/browser/locales/en-US/searchplugins/bing.xml b/browser/locales/en-US/searchplugins/bing.xml index d416b44..f9a2a85 100644 --- a/browser/locales/en-US/searchplugins/bing.xml +++ b/browser/locales/en-US/searchplugins/bing.xml @@ -9,12 +9,12 @@ <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAEACADaCwAAJgAAACAgAAABAAgAlAIAAAAMAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIAgAAAJCRaDYAAAAJcEhZcwAACxMAAAsTAQCanBgAAApPaUNDUFBob3Rvc2hvcCBJQ0MgcHJvZmlsZQAAeNqdU2dUU+kWPffe9EJLiICUS29SFQggUkKLgBSRJiohCRBKiCGh2RVRwRFFRQQbyKCIA46OgIwVUSwMigrYB+Qhoo6Do4iKyvvhe6Nr1rz35s3+tdc+56zznbPPB8AIDJZIM1E1gAypQh4R4IPHxMbh5C5AgQokcAAQCLNkIXP9IwEA+H48PCsiwAe+AAF40wsIAMBNm8AwHIf/D+pCmVwBgIQBwHSROEsIgBQAQHqOQqYAQEYBgJ2YJlMAoAQAYMtjYuMAUC0AYCd/5tMAgJ34mXsBAFuUIRUBoJEAIBNliEQAaDsArM9WikUAWDAAFGZLxDkA2C0AMElXZkgAsLcAwM4QC7IACAwAMFGIhSkABHsAYMgjI3gAhJkAFEbyVzzxK64Q5yoAAHiZsjy5JDlFgVsILXEHV1cuHijOSRcrFDZhAmGaQC7CeZkZMoE0D+DzzAAAoJEVEeCD8/14zg6uzs42jrYOXy3qvwb/ImJi4/7lz6twQAAA4XR+0f4sL7MagDsGgG3+oiXuBGheC6B194tmsg9AtQCg6dpX83D4fjw8RaGQudnZ5eTk2ErEQlthyld9/mfCX8BX/Wz5fjz89/XgvuIkgTJdgUcE+ODCzPRMpRzPkgmEYtzmj0f8twv//B3TIsRJYrlYKhTjURJxjkSajPMypSKJQpIpxSXS/2Ti3yz7Az7fNQCwaj4Be5EtqF1jA/ZLJxBYdMDi9wAA8rtvwdQoCAOAaIPhz3f/7z/9R6AlAIBmSZJxAABeRCQuVM qzP8cIAABEoIEqsEEb9MEYLMAGHMEF3MEL/GA2hEIkxMJCEEIKZIAccmAprIJCKIbNsB0qYC/UQB00wFFohpNwDi7CVbgOPXAP+mEInsEovIEJBEHICBNhIdqIAWKKWCOOCBeZhfghwUgEEoskIMmIFFEiS5E1SDFSilQgVUgd8j1yAjmHXEa6kTvIADKC/Ia8RzGUgbJRPdQMtUO5qDcahEaiC9BkdDGajxagm9BytBo9jDah59CraA/ajz5DxzDA6BgHM8RsMC7Gw0KxOCwJk2PLsSKsDKvGGrBWrAO7ifVjz7F3BBKBRcAJNgR3QiBhHkFIWExYTthIqCAcJDQR2gk3CQOEUcInIpOoS7QmuhH5xBhiMjGHWEgsI9YSjxMvEHuIQ8Q3JBKJQzInuZACSbGkVNIS0kbSblIj6SypmzRIGiOTydpka7IHOZQsICvIheSd5MPkM+Qb5CHyWwqdYkBxpPhT4ihSympKGeUQ5TTlBmWYMkFVo5pS3aihVBE1j1pCraG2Uq9Rh6gTNHWaOc2DFklLpa2ildMaaBdo92mv6HS6Ed2VHk6X0FfSy+lH6JfoA/R3DA2GFYPHiGcoGZsYBxhnGXcYr5hMphnTixnHVDA3MeuY55kPmW9VWCq2KnwVkcoKlUqVJpUbKi9Uqaqmqt6qC1XzVctUj6leU32uRlUzU+OpCdSWq1WqnVDrUxtTZ6k7qIeqZ6hvVD+kfln9iQZZw0zDT0OkUaCxX+O8xiALYxmzeCwhaw2rhnWBNcQmsc3ZfHYqu5j9HbuLPaqpoTlDM0ozV7NS85RmPwfjmHH4nHROCecop5fzforeFO8p4ikbpjRMuTFlXGuqlpeWWKtIq1GrR+u9Nq7tp52mvUW7WfuBDkHHSidcJ0dnj84FnedT2VPdpwqnFk09OvWuLqprpRuhu0R3v26n7pievl6Ankxvp955vef6HH0v/VT9bfqn9UcMWAazDCQG2wzOGDzFNXFvPB0 vx9vxUUNdw0BDpWGVYZfhhJG50Tyj1UaNRg+MacZc4yTjbcZtxqMmBiYhJktN6k3umlJNuaYppjtMO0zHzczNos3WmTWbPTHXMueb55vXm9+3YFp4Wiy2qLa4ZUmy5FqmWe62vG6FWjlZpVhVWl2zRq2drSXWu627pxGnuU6TTque1mfDsPG2ybaptxmw5dgG2662bbZ9YWdiF2e3xa7D7pO9k326fY39PQcNh9kOqx1aHX5ztHIUOlY63prOnO4/fcX0lukvZ1jPEM/YM+O2E8spxGmdU5vTR2cXZ7lzg/OIi4lLgssulz4umxvG3ci95Ep09XFd4XrS9Z2bs5vC7ajbr+427mnuh9yfzDSfKZ5ZM3PQw8hD4FHl0T8Ln5Uwa9+sfk9DT4FntecjL2MvkVet17C3pXeq92HvFz72PnKf4z7jPDfeMt5ZX8w3wLfIt8tPw2+eX4XfQ38j/2T/ev/RAKeAJQFnA4mBQYFbAvv4enwhv44/Ottl9rLZ7UGMoLlBFUGPgq2C5cGtIWjI7JCtIffnmM6RzmkOhVB+6NbQB2HmYYvDfgwnhYeFV4Y/jnCIWBrRMZc1d9HcQ3PfRPpElkTem2cxTzmvLUo1Kj6qLmo82je6NLo/xi5mWczVWJ1YSWxLHDkuKq42bmy+3/zt84fineIL43sXmC/IXXB5oc7C9IWnFqkuEiw6lkBMiE44lPBBECqoFowl8hN3JY4KecIdwmciL9E20YjYQ1wqHk7ySCpNepLskbw1eSTFM6Us5bmEJ6mQvEwNTN2bOp4WmnYgbTI9Or0xg5KRkHFCqiFNk7Zn6mfmZnbLrGWFsv7Fbou3Lx6VB8lrs5CsBVktCrZCpuhUWijXKgeyZ2VXZr/Nico5lqueK83tzLPK25A3nO+f/+0SwhLhkralhktXLR1Y5r2sajmyPHF52wrjFQUrhlYGrDy4irYqbdVPq+1Xl65+vSZ6TWuBXsHKgsG1AWvrC1UK5YV9 69zX7V1PWC9Z37Vh+oadGz4ViYquFNsXlxV/2CjceOUbh2/Kv5nclLSpq8S5ZM9m0mbp5t4tnlsOlqqX5pcObg3Z2rQN31a07fX2Rdsvl80o27uDtkO5o788uLxlp8nOzTs/VKRU9FT6VDbu0t21Ydf4btHuG3u89jTs1dtbvPf9Psm+21UBVU3VZtVl+0n7s/c/romq6fiW+21drU5tce3HA9ID/QcjDrbXudTVHdI9VFKP1ivrRw7HH77+ne93LQ02DVWNnMbiI3BEeeTp9wnf9x4NOtp2jHus4QfTH3YdZx0vakKa8ppGm1Oa+1tiW7pPzD7R1ureevxH2x8PnDQ8WXlK81TJadrpgtOTZ/LPjJ2VnX1+LvncYNuitnvnY87fag9v77oQdOHSRf+L5zu8O85c8rh08rLb5RNXuFearzpfbep06jz+k9NPx7ucu5quuVxrue56vbV7ZvfpG543zt30vXnxFv/W1Z45Pd2983pv98X39d8W3X5yJ/3Oy7vZdyfurbxPvF/0QO1B2UPdh9U/W/7c2O/cf2rAd6Dz0dxH9waFg8/+kfWPD0MFj5mPy4YNhuueOD45OeI/cv3p/KdDz2TPJp4X/qL+y64XFi9++NXr187RmNGhl/KXk79tfKX96sDrGa/bxsLGHr7JeDMxXvRW++3Bd9x3He+j3w9P5Hwgfyj/aPmx9VPQp/uTGZOT/wQDmPP8YzMt2wAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAABBUlEQVR42mL8v4OBJMAEZ/0nTgMLnLXtitKRO9JmCi9cNR/wsP8mrOHfP8YbL4RvvBBWFXuvI/WGsJMYSHUSMujbY8LN/ttM4bmO1BtW5n+ENdipPmndbrHjqiIn6x9DuZc2yk8tlZ7hc5Kx/AtzxecMDAzff7Mcuys9/7gOAT8wMjAUOZ9x0XhI2A98HL+Eub/vuSG/8ozGmy+cE EF+zp/YNYjxfvPTv9O63fLpBx6ICCvz32DD24EGt7Fo4Gb/zcX2Z84RPbiIqfyLZJtL4rzfsDvJUf3R91+sC09o//7LJMn/NdXmkqHsSyzeQ0t8j9/znn8s7ql9Dy34cWogIbUSCQADAJ+jWQrH9LCsAAAAAElFTkSuQmCCiVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAACW0lEQVR4nGP8v5OBpoCJtsbTwQIWTKGUxe5mCi9M5V/oSL9mZf5HoQWMmHEQOD0AwuBg/WMo+8pB/ZGZwguyLcDiAzj48Zvl+D2pTz/YKLGAcBxcfSZCtulEWUAhGDQW3HstcOOF8P//jKRagC+SkQE/58/0pa7c7L9N5V+aKTw3kH3FxvKXmhYI83y3VXl64Jbs3htye2/IsbH8NZB9Zabw3FT+JR/nTypYwMDAEGBw+8AtWQj71x/mU/clT92XZGT8ry7+zlzxhbnic0n+LxRZIC/8yUju5blH4siC//8z3nghfOOF8MLj2jKCnydH7EXTRVoqCjC4g0f2yXteTEHSLNCVft0WcNhM4QXxiYmEIIIATcm3mpJvn37gmX7Q8OozYYLqycloTz/wLDulRYzpDMT4QFf6NZz95gvnyjMa+27I/SM6xxGwQJj7R6rtJQYGhk8/2NaeU9t+RfH3X2ZcihWEP5Fmgazg53qfY9zsv1ed0dh4UeXbL5yKudl/R5tdd9O6T4IFGhJvyz1OHbkts/qc2qfv7LiUMTIwOGk8irW4yo8jP2O3wEzxubHcy7I1Dq+/cOIymoGBQVn0Q5rtRTXx93jUYLFAX+b1sw88p+5L4tHGy/Er2uy6m9YDRsb/eJRht8BS+emCY7q4NDAyMLhpPYixuMbD/gu/0VD1WBtezz7w9O81vvNKEE1cTfxdmu0lZdEPxBiNzwIGBoa//xhXndFYfU4NUsnwcf6Ms7jmpPGQ1BoHpwUQcOOF0OT9RoayryJNr3 Oz/ybRcCIsoBwMmkp/8FoAADmgy6ulKggYAAAAAElFTkSuQmCC</Image> <Image width="65" height="26">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAAEEAAAAaCAYAAADovjFxAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NDkxMSwgMjAxMy8xMC8yOS0xMTo0NzoxNiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVBOTQzNENBQzQxNDExRTM5RURBRUU5NUU4QkU3NjA4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVBOTQzNENCQzQxNDExRTM5RURBRUU5NUU4QkU3NjA4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOm luc3RhbmNlSUQ9InhtcC5paWQ6NzU2RTRERkZDMzc1MTFFMzlFREFFRTk1RThCRTc2MDgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzU2RTRFMDBDMzc1MTFFMzlFREFFRTk1RThCRTc2MDgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz76XOiPAAAD1ElEQVR42uyYeUgVQRzH9+nLNE07kMKIiqAkSaUIMgUpyu6eHdBhVBSBZQf1R4XkP0WHFUURWBlRmGGHdkI3nWIXVHZIaNkhFXmWYni+vhPfhWHZfbvvqVjZDz7Mzs6w8+Y3v2ue3eFwPFUU5R64CG6BRqWDiReIBCvBNfAeHAXjOpoSqqV+H7AQbO1oStCTz/+VoCjONlpvDdgPelqc3x8kgMD2UEJbSTRIAkMszhfB+jhIbU8lxIIZrbjeV7b1FudngefgansqoQ5kg3cgDUwBXVthXavutoXZ61x7KuEBOAkGgESap0ijGWAeCPZwXZv0bNf0PZFObuzX7klM2Kjp9wDzQSYVcgWsAqFubD4fjAIloAE0g0sgXDN/Li1xBPt+IAcks3+KViXc6xmYbrDuGBaETVzvFegHloKzVpRQBK4bjHUB48FeUADyQDcX32pmuxPkgkr6vahaJ9P/Q3Vi0mD2fbjRdeAln4VSboIIPkdp1lzA8RjuQ1h2CA9wH4i3mh2SLc4bCQJMYozCDDEbDOVpDwPLOHZGml/KtlpSongOArV0g5lgLFguxRFVxGaP0VrCQByYA7pT+b7ie1aV8ASMBhdM5jWY3D3UgLiLpizLAfCGP3agi2/4s43RvE+jucdKbpfEdjV4reNqVSLQu1Mn3AYOxoTcFgawHIPxbLZhJsHtg0Ga/cJxVdkTdKxLlnxFL1JKvqcn4oQWMai0RAk/DcarpFjjSmpN3E2uOOX 6RCuNrpTQWdPvC9ZL5uVqk3YL7mBUJ4SwLTdZx2gNb4P1vA3c1McoRZaBxXwWAWgbM0SShZN+KJ2mnqgm3MtgXE1xL1qpDiowca8IReM/ClNUMH1OpKG3YIML91DlB1jL7FDjYp56Grt1xmbRzfJcmK9VUS0ik+0OnTmbWf3WeEkbPMQSdRqVkGrxtncYDAJ7LMwNlE6mhEXXRLAdnOZYgjTfTxNLbJrvaCVI009nPRDH+0c8mMrALIrAQuFaduZeUUAcAZeliGom92kl7mSKeqbRSSyYMqSxYiqgWHpXw/l1ko+LfoXB98s1dUoTrfMEFREnjQ1nbbHE5nA4vvOCFGlxI2UsntI9MNNARn7V3KNobd/AI535AaSSirAxnjTyd2glmK6g507hDPBCsXf47qN4J5SQyELDihykAir+gT+U/KmQIi9WasKn75qYfjRvkn+bAoINAud5Pqeo+baQ5WYK2KT5EySFwe9vFF+6Win/kxAn35sls3oLzbLrpI0b3PRjsMIk5f3pYmPsSuC1WZVPrH9+hwGb0+lUOrr8EmAAiqTecoRlgJMAAAAASUVORK5CYII=</Image> <Image width="130" height="52">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAAA0CAYAAABGkOCVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NDkxMSwgMjAxMy8xMC8yOS0xMTo0NzoxNiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjc1NkU0REZEQzM3NTExRTM5RURBRUU5NUU4QkU3NjA4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjc1NkU0REZFQzM3NTExRTM5RURBRUU5NUU4QkU3NjA4Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmO mluc3RhbmNlSUQ9InhtcC5paWQ6NzU2RTRERkJDMzc1MTFFMzlFREFFRTk1RThCRTc2MDgiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzU2RTRERkNDMzc1MTFFMzlFREFFRTk1RThCRTc2MDgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5lzzn9AAAIPUlEQVR42uxdCWwVRRie0gqtFwTQGIyAXJYABry4VLwPQFsFAcUjeKAGotEoAQ8UFC80EhVUFBUUFCogGApFVMIRzqgIaGlEKArKoaBSrkLr/2W/l0wn+97bbXfbpW++5Evf7pvdtzvzz3/NP5BWXl6uLCzScnJyNsnf5cLPhN8KS223pB4yhG3IQcLtwhXCucJ5wr9tF6UG6gj/047PFPYVThEWCxcLHxOeY7uq9gtCPJws7CEcKywUrhNea7ss9QTBxLnCi2yXWUFQ1mewgmBhBcHCCsLxjRbCkcIr7DCntiCcKhwl/Fq4WXh5CL9xt3CRcIaw7fHcWRm1WBAOGdqhk3Iyp0EhVzhJO4agnS3cbzVCtLEv4PvlGseNhc1S0TRkCuulsFmdaRwX0wSlnCBk0D5OoFo8McUE4UvhffRBIBSXGuYoZXwE2MJlwuHCB4V7lLNQhQUrrGbuTAFheJ9M+ahhhDbgsJF3cXYUUyjuUc7KpkUKOIsvu5yD79CTswX1DqupOdrZLq+9goAQ6liSNhcKXxRuEP4oHEebmmaHoPbkEf4VviF8xGP7DuTDwm30M2YLF/JeYcEUuoHCfsKWyllyR83ebuH3wg+Eq5Lc7wRhf2FdHv+snKKeRG1+ES7Rvr9X2EfYXJjFCbVDmC98S1WsFfGK3nyv9sKGmj/3k/BjOrmK2rkzPx9BqRo6/xSPPzJUON7lPApafg8gzocJ+YL+xbYq3i+bg6N3+iS+/C QPZmo6hSWetqtv5CbyOACJ2iwQXi/sIpycxH/aQyH6xuP7XiB8m38TYT7N9k3CWUGaBgAlbtOqeI8GwmsYjm7hjBzJ2RoEMNPPEK706KtgEH5I8H2ZsEQ73u2hTYGwCTVHMie6MUPTVh6e9UbhGg9CoCiInxoasiTIzOILAfsuKIIZxcGrKjAgF9P8KJqBV4Q5ylkjgKlCid6HxnXtqaES3Vdp90zWprv2DJjxw5iDacu/T7lcPyPJu3UUzjHObaDpvZL37iYcQv8MGCB8T3u2siDXGjZSjQW92hdEVXU5HVTMApTd5TKaMTtvJjtVH/wczqL5ATxHX/5dyvvu1b7Dcy2moKzSZizWSM4TfhfnnqYQjKcJN7GC2naichJhDYOOGnQ8E1GnOJ0du4+aZlOCtnOYD9ExJsBn2cWIaW+c79cw1NbRL07bB4RNteP8OEKgYzD9GRWmICyjI5IXUYEY4NETn0INobRZGVQl92APbVAwfFA7jlcr+pD2eT/fz2s/HAlTEGJeaT96xh+p6GyY2UpnzSsmGsfdA3iGP1xUeTxTVqgdN3Fp01pVrIGY5SPcLDN9jzCXoWHnBvGBkX1cKzxag4Kw0Gf7AsMBbBLAM6z30XZnknEytxbM8/ksS6tLEGIops2DPavJKugin+23GaFfEILgJ9fyp/bZLZfRwpjhK30+y4HqFoSmDC0RE59eg4LgVwjTjdCvfkDRi1ckS9vrXv9BhqN+UFc/CLNUDR2H5enRykm1Hm84agxcELUGdQJsqyfaSjwITkKh9CsImR7aYNCRzn1O2ChiA+sH6Ogsw9GLEvSBTKuEIJRWxTQkK8y8nbZ4QoBCEJT5yvLZPttQn3siJgj6WCA9f6rP60+rbCdPY3ztBmTqYqtbzWt4JsdDK5/tLzOOo1aPuMvQwl18Xt+tMoKAGT7QSHLEOgve6mwVfF3/TiY+tgd0P7/7Gu4wHLclEROE1cbxzT6v7+1XELDwM8Q4h1U uJI6wT6BzCC/5KmfwdMNzrwrwzF53c/dSFTOJnwv/iZgg5BsOLCaq13KCJ0x/L5kgYHHiWcNuolOQD78uhJdDEgeraY+rcDaKzPPguzSiAJqCGTVAO88yHPm5Hq7DiuQYP44Y1rhjFbpnKWeJFoUefUJ4Kaj//hSudSF62Fjjx1JsjzjtevD7k7RzSDWvjWiIO8LFVC/geMWb2Iv4+YAeabiFj1DFKNwopKpBMmiwmYAIECg+GavC3RNQzlkOYUOGcLFylmWXMwbHwGMtoatxHZbW749wrgPZT2Rs39HOIfWMkrivlFNYA2e7KZ3DmLmDWZ+stGKiDCMexY1bUFJgEoaGmAvA4svTyl/+vbJhJz6PY1QTy8l3dRl4HRCUngm+TzOSOvU8tMn08fx620Sbh95VTvGObsLr0s/p5dIeKX+UqXXS+6iOphVm0EFDwcRW5dQWhCEERZyZuSEKgZlwiYWP+YxEEtVD7qYzhRm0L8n9S43IojJt4uGYjxB6FM1qooLbMk4GVGMdpiDEkJ5BYSig6syjIIQFmIHnlb+ce2Wx2QhpYzWFeM+Z9IHa0G84xoTRZvZFiYf7l7BTY7Nqr4c2fiKPYZpTd8Sjo11AP6cjtQQ0w1/KWexawgnullA6hCrmcnZAyxAHZTpVV6GyiAow6WOlc0WQ1EdDFIKNNAMDrBBEDno9wxYIwuvK+afzVgb4I6X0Mdqr5FW4FtWPW4zkU17Mdq2nB/1SAD8yjYmn0ba/I4lMI9wEPqnjkqC4inGoXyARdINyUp2/2v6uNpyv4ifITMB5Rla4oRFxHE7Pzs42G2OXEbZOtabHmwxIBKH24FblvxzMoup4jezAELGU4eZhRg2NGEWg4nmqqlglVhRzGBE1JPqRO4Vvqvhr3dg6NVxVfZ+iReXVPApmGhjnUc2M0rwsfueWFUbZwCVsl3TRaQrVyXwXM3C18DYrBDUKqPgDLufhCDbj7DeFANoCu6HaKa2O00up GrZpI9X6JDXERKoii5rHDg54b44RtsZhLUVPayNZhmTab8pZf5jKzxWQZv8rHwvgfwEGAFtXxJ2uv6OVAAAAAElFTkSuQmCC</Image> - <Url type="application/x-suggestions+json" template="http://api.bing.com/osjson.aspx"> + <Url type="application/x-suggestions+json" template="https://api.bing.com/osjson.aspx"> <Param name="query" value="{searchTerms}"/> <Param name="form" value="OSDJAS"/> <Param name="language" value="{moz:locale}"/> </Url> - <Url type="text/html" method="GET" template="http://www.bing.com/search"> + <Url type="text/html" method="GET" template="https://www.bing.com/search"> <Param name="q" value="{searchTerms}"/> <MozParam name="pc" condition="pref" pref="ms-pc"/> <MozParam name="form" condition="purpose" purpose="contextmenu" value="MOZCON"/> @@ -23,5 +23,5 @@ <MozParam name="form" condition="purpose" purpose="keyword" value="MOZLBR"/> <MozParam name="form" condition="purpose" purpose="newtab" value="MOZTSB"/> </Url> - <SearchForm>http://www.bing.com/search</SearchForm> + <SearchForm>https://www.bing.com/search</SearchForm> </SearchPlugin> diff --git a/browser/locales/en-US/searchplugins/disconnect.xml b/browser/locales/en-US/searchplugins/disconnect.xml new file mode 100644 index 0000000..40c512f --- /dev/null +++ b/browser/locales/en-US/searchplugins/disconnect.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> + <ShortName>Disconnect</ShortName> + <LongName>Disconnect Private Search</LongName> + <Description>Private searches using disconnect.me</Description> + <Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> + <Param name="query" value="{searchTerms}"/> + </Url> + <Image height="16" width="16" type="image/icon">data:image/x-icon;base64, AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAD///8B////Af///xP///9H////ff///43///+B////af///0X///8f////B////xP///9H////ff///4////9r////Af///wH///8Zd3d3r0NDQ/9BQUH/Tk5O925ubuGxsbGt////X////yX///8fd3d3rzs7O/8qKir/IiIi/////xP///8Z////LXp6erNERET/RERE/0NDQ/8+Pj7/MjIy/3BwcNX///9b////MXR0dK06Ojr/Kioq/yIiIv////9H////X////2d4eHi5Pj4+/0JCQv9ERET/Q0ND/zs7O/8wMDD/eXl5x////01iYmKjMjIy/ycnJ/8iIiL/fn5+v4eHh9N/f3/PUFBQ1UFBQc9BQUHlQ0ND/0RERP9AQED/NTU1/yoqKv/Jycl9WVlZey8vL8csLCzJKioqx0JCQv83Nzf/KCgo/0BAQN3///8l////A3Nzc1dISEj1Q0ND/zk5Of8pKSn/VVVVz////yn///8B////Af///wFCQkL/Nzc3/ygoKP9AQEDd////Jf///wH///8Nb29vpURERP87Ozv/Kioq/zIyMvH///8v////Af///wH///8BQkJC/zc3N/8oKCj/QEBA3f///yX///8B////Da2trWtDQ0P/Ozs7/yoqKv8iIiL/////L////wH///8B////AUJCQv83Nzf/KCgo/0FBQd3///8l////Bf///yW9vb2FQkJC/zg4OP8pKSn/IiIi/////yf///8B////Af///wFCQkL/Ojo6/y4uLv9LS0vh////Rf///zf///9jioqKzUBAQP8zMzP/JiYm/zMzM+H///8Z// //Af///wH///8BQ0ND/z8/P/87Ozv/Xl5e6f///4v///+PmpqazUNDQ/86Ojr/LS0t/yQkJP9ERESp////C////wH///8B////AURERP9DQ0P/Q0ND/0xMTPtoaGjtRERE/0NDQ/89PT3/MTEx/yYmJv8iIiL/e3t7Nf///wH///8B////Af///wFERET/RERE/0RERP9DQ0P/QkJC/0BAQP87Ozv/MTEx/ycnJ/8jIyP/RkZGc////wX///8B////Af///wH///8BOzs7/zs7O/87Ozv/Ojo6/zc3N/8zMzP/LS0t/yYmJv8jIyP/Ozs7ff///wX///8B////Af///wH///8B////ASoqKv8qKir/Kioq/yoqKv8pKSn/JiYm/y0tLckyMjKbU1NTKf///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//w==</Image> +</OpenSearchDescription> diff --git a/browser/locales/en-US/searchplugins/list.txt b/browser/locales/en-US/searchplugins/list.txt index 0466f4e..0d07ea6 100644 --- a/browser/locales/en-US/searchplugins/list.txt +++ b/browser/locales/en-US/searchplugins/list.txt @@ -1,9 +1,9 @@ -amazondotcom -bing -duckduckgo -eBay -google -startpage +disconnect +youtube twitter wikipedia +startpage yahoo +bing +google +duckduckgo diff --git a/browser/locales/en-US/searchplugins/youtube.xml b/browser/locales/en-US/searchplugins/youtube.xml new file mode 100644 index 0000000..42b04c0 --- /dev/null +++ b/browser/locales/en-US/searchplugins/youtube.xml @@ -0,0 +1,10 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> +<os:ShortName>YouTube</os:ShortName> +<os:Description>YouTube - Videos</os:Description> +<os:InputEncoding>UTF-8</os:InputEncoding> +<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgNkQkIDZGiCA2RzAgNkcwIDZH/CA2R/wgNkf8IDZH/CA2R/wgNkf8IDZH/CA2R2AgNkcwIDZHMCA2RhAgNkQYIDpWHCA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpX/CA6V/wgOlf8IDpWHCQ6ZzAkOmf8JDpn/CQ6Z/wkOmf8JDpb/BQhc/wgMgf8JDpn/CQ6Z/wkOmf8JDpn/CQ6Z/wkOmf8JDpn/CQ6ZzAkOnuoJDp7/CQ6e/wkOnv8JDp7/Exed/8jIy/9RU4j/Bwp0/wkOm/8JDp7/CQ6e/wkOnv8JDp7/CQ6e/wkOnuoJD6T8CQ+k/wkPpP8JD6T/CQ+k/xUbo//V1dX/1dXV/4yNrP8QFG//CA6Y/wkPpP8JD6T/CQ+k/wkPpP8JD6T8CQ+q/wkPqv8JD6r/CQ+q/wkPqv8WG6n/3d3d/93d3f/d3d3/v7/M/y0wjv8JD6r/CQ+q/wkPqv8JD6r/CQ+q/woQr/8KEK//ChCv/woQr/8KEK//Fx2v/+fn5//n5+f/5+fn/+jo6P+YmtP/ChCv/woQr/8KEK//ChCv/woQr/8KELX8ChC1/woQtf8KELX/ChC1/xgdtf/x8fH/8fHx//Ly8v+bndv/Ehi3/woQtf8KELX/ChC1/woQtf8KELX8ChG 76goRu/8KEbv/ChG7/woRu/8YH77/+fn5/+/v9/9fY9H/ChG7/woRu/8KEbv/ChG7/woRu/8KEbv/ChG76goRwMwKEcD/ChHA/woRwP8KEcD/EBfB/6Ol5/8tM8n/ChHA/woRwP8KEcD/ChHA/woRwP8KEcD/ChHA/woRwMwLEcSHCxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcT/CxHE/wsRxP8LEcSHCxLICQsSyKULEsjMCxLI+QsSyP8LEsj/CxLI/wsSyP8LEsj/CxLI/wsSyP8LEsj/CxLI0gsSyMwLEsiiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAP//AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAD//wAA//8AAA==</os:Image> +<SearchForm>https://www.youtube.com/index</SearchForm> +<os:Url type="text/html" method="GET" template="https://www.youtube.com/results?search_query={searchTerms}&search=Search" resultDomain="youtube.com"> +</os:Url><os:Url type="application/x-suggestions+json" method="GET" template="https://suggestqueries.google.com/complete/search?output=firefox&ds=yt&…" resultDomain="suggestqueries.google.com"> +</os:Url> +</SearchPlugin>

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 510f2ddd444a7e656ae2cf872731226b84401b53 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 26 12:55:25 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We add the search engine defaults directly to our central preference file in order to avoid issues like #11236 where search engine names get translated. --- browser/app/profile/000-tor-browser.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index dff718a..54fa6e3 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -148,8 +148,16 @@ pref("xpinstall.whitelist.add.36", ""); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"social-share-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"newElementCount\":0}"); -// Omnibox settings -pref("keyword.URL", "https://startpage.com/do/search?q="); +// Putting the search engine prefs into this file to fix #11236. +// Default search engine +pref("browser.search.defaultenginename", "Startpage"); + +// Search engine order (order displayed in the search bar dropdown) +// Somewhat surprisingly we get Startpage - DuckDuckGo - Google as the order +// only if we set them as below. +pref("browser.search.order.extra.1", "DuckDuckGo"); +pref("browser.search.order.extra.2", "Google"); +pref("browser.search.order.extra.3", "Startpage"); // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? // Nvida cards also experience crashes without the second pref set to disabled

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug 14490: Make Disconnect the default search engine
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit b4d03579fda41c3005f52979b25f29278ee2fe0c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:22:50 2015 -0800 Bug 14490: Make Disconnect the default search engine --- browser/app/profile/000-tor-browser.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 54fa6e3..0d5faa6 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -150,14 +150,14 @@ pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\" // Putting the search engine prefs into this file to fix #11236. // Default search engine -pref("browser.search.defaultenginename", "Startpage"); +pref("browser.search.defaultenginename", "Disconnect"); // Search engine order (order displayed in the search bar dropdown) -// Somewhat surprisingly we get Startpage - DuckDuckGo - Google as the order +// Somewhat surprisingly we get Disconnect - YouTube - Twitter as the order // only if we set them as below. -pref("browser.search.order.extra.1", "DuckDuckGo"); -pref("browser.search.order.extra.2", "Google"); -pref("browser.search.order.extra.3", "Startpage"); +pref("browser.search.order.extra.1", "YouTube"); +pref("browser.search.order.extra.2", "Twitter"); +pref("browser.search.order.extra.3", "Disconnect"); // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? // Nvida cards also experience crashes without the second pref set to disabled

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug #4902: Add DDG and StartPage to Omnibox.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit d653d7bdff8e36366d551968dfac1cad9cd1dbef Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 23 12:03:52 2015 +0000 fixup! Bug #4902: Add DDG and StartPage to Omnibox. We don't mess with the region.properties anymore as this is fragile: Translators start to translate the search engine names (see #11236). We put the necessary values into our central preference file, 000-tor-browser.js, instead of overriding the values set in the respective locales. --- browser/locales/en-US/chrome/browser-region/region.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties index 16963f3..e078ed5 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -3,12 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=Startpage +browser.search.defaultenginename=Google # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google +browser.search.order.1=Google +browser.search.order.2=Yahoo +browser.search.order.3=Bing # This is the default set of web based feed handlers shown in the reader # selection UI

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_9387_12430'
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit 0633db0e9cabaf83b035d0eb44a97155b37675b4 Merge: a99ed67 47ff237 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 15:06:47 2015 -0800 Merge remote-tracking branch 'gk/bug_9387_12430' src/chrome/content/torbutton.js | 2 ++ 1 file changed, 2 insertions(+)

1 0

[torbutton/master] Bug 9387: Bind jar: pref to security slider
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit 47ff237d15353ca6658fd1a4ef09aa0c6c993cc3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 16:22:49 2015 +0000 Bug 9387: Bind jar: pref to security slider We are binding the preference governing the jar: protocol handler to the security slider (see #12430 for more details). --- src/chrome/content/torbutton.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9cdb792..567574f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -234,6 +234,7 @@ var torbutton_unique_pref_observer = case "javascript.options.asmjs": case "noscript.forbidMedia": case "media.webaudio.enabled": + case "network.jar.block-remote-files": case "javascript.options.baselinejit.content": case "noscript.forbidFonts": case "gfx.font_rendering.graphite.enabled": @@ -2160,6 +2161,7 @@ var torbutton_sec_ml_bool_prefs = { "javascript.options.asmjs" : false, "noscript.forbidMedia" : true, "media.webaudio.enabled" : false, + "network.jar.block-remote-files", true, // XXX: pref for disabling MathML is missing };

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug 12430: Disable external jar: via preference
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit cc60be8eee7b39138adb44c09d0905f8fb7fb0c9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 14:52:15 2015 -0800 fixup! Bug 12430: Disable external jar: via preference Actually, we should block remote JARs before the load. --- modules/libjar/nsJARChannel.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index f958554..6fcdac8 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -764,6 +764,12 @@ nsJARChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *ctx) if (NS_FAILED(rv)) return rv; + // Check preferences to see if all remote jar support should be disabled + if (!mJarFile && Preferences::GetBool("network.jar.block-remote-files", true)) { + mIsUnsafe = true; + return NS_ERROR_UNSAFE_CONTENT_TYPE; + } + // These variables must only be set if we're going to trigger an // OnStartRequest, either from AsyncRead or OnDownloadComplete. // @@ -898,7 +904,8 @@ nsJARChannel::OnDownloadComplete(nsIDownloader *downloader, mContentDisposition = NS_GetContentDispositionFromHeader(mContentDispositionHeader, this); } - // here we check preferences to see if all remote jar support should be disabled + // This is a defense-in-depth check for the preferences to see if all remote jar + // support should be disabled. This check may not be needed. if (Preferences::GetBool("network.jar.block-remote-files", true)) { mIsUnsafe = true; status = NS_ERROR_UNSAFE_CONTENT_TYPE;

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug 12430: Disable external jar: via preference
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit a4a1c52ccc7f8e5f60c2d0e35d40b3b5f5ddd71f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 16:05:21 2015 +0000 Bug 12430: Disable external jar: via preference This is a patch written by Jeff Gibat (iSECPartners) to disable the jar: protocol handler via a preference. The preference is bound to the security slider settings (#9387). --- modules/libjar/nsJARChannel.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index d190973..f958554 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -898,6 +898,12 @@ nsJARChannel::OnDownloadComplete(nsIDownloader *downloader, mContentDisposition = NS_GetContentDispositionFromHeader(mContentDispositionHeader, this); } + // here we check preferences to see if all remote jar support should be disabled + if (Preferences::GetBool("network.jar.block-remote-files", true)) { + mIsUnsafe = true; + status = NS_ERROR_UNSAFE_CONTENT_TYPE; + } + if (NS_SUCCEEDED(status) && mIsUnsafe && !Preferences::GetBool("network.jar.open-unsafe-types", false)) { status = NS_ERROR_UNSAFE_CONTENT_TYPE;

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit c8a640f0818a968170149dad9bd8ebc1198ee9f1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 16:13:06 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index fd0a35c..dff718a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -160,6 +160,11 @@ pref("layers.acceleration.disabled", true); // in FF24. This is a dangerous combination (spotted by iSec) pref("media.audio_data.enabled", false); +// If true, remote JAR files will not be opened, regardless of content type +// Patch done by Jeff Gibat (iSEC). We bind it to the security slider but allow +// jar: in default mode. +pref("network.jar.block-remote-files", false); + // Enable TLS 1.1 and 1.2: // https://trac.torproject.org/projects/tor/ticket/11253 pref("security.tls.version.max", 3);

1 0

[tor-browser-bundle/maint-4.0] Bug 14849: Remove new NoScript option to make permissions permanent
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit b7c8d8fe373e015d9d2a646f61d368756bc68d53 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 16:55:57 2015 -0800 Bug 14849: Remove new NoScript option to make permissions permanent --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 02cee1b..f5a3f3c 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false);

1 0

[tor-browser-bundle/master] Bug 14849: Remove new NoScript option to make permissions permanent
by mikeperry＠torproject.org 11 Feb '15

11 Feb '15

commit c5e6ba341a3cda60cad0fb905213423ad6279b40 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 16:55:57 2015 -0800 Bug 14849: Remove new NoScript option to make permissions permanent --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3b8e31e..39fa6a9 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 02cee1b..f5a3f3c 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -59,3 +59,4 @@ pref("noscript.autoReload", true); pref("noscript.autoReload.allTabs", false); pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); +pref("noscript.showVolatilePrivatePermissionsToggle", false);

1 0

[torbutton/master] Bug 13406: Stop directing users to download-easy.html.en
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit 2ccb9cb66415e4f5de5fc4b496272921cac6614f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 9 11:19:33 2015 -0500 Bug 13406: Stop directing users to download-easy.html.en Always display a "Check for Tor Browser Update..." menu item (to avoid localization issues, the menu item label entity was not renamed). When the menu item is chosen, open the Update Service prompt window to perform the update check. --- src/chrome/content/popup.xul | 7 +++---- src/chrome/content/torbutton.js | 30 +++++++++--------------------- src/chrome/locale/en/aboutTor.dtd | 4 ++-- src/chrome/locale/en/torbutton.dtd | 2 +- src/chrome/skin/torbutton.css | 4 ++-- 5 files changed, 17 insertions(+), 30 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 5f12f2b..e61dcfe 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -37,13 +37,12 @@ label="&torbutton.context_menu.networksettings;" accesskey="&torbutton.context_menu.networksettings.key;" oncommand="torbutton_open_network_settings()"/> - <menuseparator hidden="true"/> - <menuitem id="torbutton-downloadUpdate" + <menuseparator/> + <menuitem id="torbutton-checkForUpdate" label="&torbutton.context_menu.downloadUpdate;" accesskey="&torbutton.context_menu.downloadUpdate.key;" insertafter="context-stop" - oncommand="torbutton_download_update()" - hidden="true"/> + oncommand="torbutton_check_for_update()"/> </vbox> <vbox>  @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> <!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update."> +<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> <!ENTITY aboutTor.check.label "Test Tor Network Settings"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 72c7d41..9709670 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -32,7 +32,7 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index f368c9c..2c6bbfb 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -101,7 +101,7 @@ statusbarpanel#plugins-status[status="0"] { list-style-image: url("chrome://torbutton/skin/poff.png"); } -#torbutton-downloadUpdate { +#torbutton-checkForUpdate[tbUpdateNeeded] { font-weight: bold; } @@ -118,4 +118,4 @@ svg#tor-circuit circle.node-circle { stroke: #195021; stroke-width: 2px; fill: white; -} \ No newline at end of file +}

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug13406-01'
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit 0ac77f28bed415b27942d5264b0e5037fb57c2a1 Merge: a717611 2ccb9cb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 9 14:51:05 2015 -0800 Merge remote-tracking branch 'brade/bug13406-01' src/chrome/content/popup.xul | 7 +++---- src/chrome/content/torbutton.js | 30 +++++++++--------------------- src/chrome/locale/en/aboutTor.dtd | 4 ++-- src/chrome/locale/en/torbutton.dtd | 2 +- src/chrome/skin/torbutton.css | 4 ++-- 5 files changed, 17 insertions(+), 30 deletions(-)

1 0

[torbutton/master] Use unicode elipsis in new menus.
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit a99ed677a29482999e99dd08e3e9208d91fd0f6f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Feb 10 14:02:22 2015 -0800 Use unicode elipsis in new menus. Might as well standardize on this, rather than going back and forth. --- src/chrome/locale/en/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 9709670..7a4284f 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -32,7 +32,7 @@ <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C">

1 0

[torbutton/master] Bug 9387: Unlock the slider if "custom" is set
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit dd28b7b49cfc775afcc0adf9b922193acded9a7f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 4 13:08:12 2015 +0000 Bug 9387: Unlock the slider if "custom" is set If the custom mode is checked allow disabling it on the preference dialog directly by clicking on the description or dragging the thumb. --- src/chrome/content/preferences.js | 29 +++++++++++++---------------- src/chrome/content/preferences.xul | 1 - 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index f67906c..1151176 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -189,12 +189,15 @@ function torbutton_prefs_init(doc) { let sec_custom = doc.getElementById('torbutton_sec_custom'); let custom_values = o_torprefs.getBoolPref('security_custom'); sec_slider.value = o_torprefs.getIntPref('security_slider'); - sec_slider.disabled = custom_values; - // Setting |disabled| to |false| is not enough to have the element - // non-responding. We need to handle |movetoclick| as well. - sec_slider.setAttribute("movetoclick", !custom_values); sec_custom.checked = custom_values; sec_custom.disabled = !custom_values; + // If the custom checkbox is checked and the user is done with dragging + // uncheck the checkbox to allow setting the (newly) chosen security level. + sec_slider.dragStateChanged = function(isDragging) { + if (!isDragging && sec_custom.checked) { + sec_custom.checked = false; + } + } torbutton_prefs_set_field_attributes(doc); } @@ -462,17 +465,11 @@ function torbutton_prefs_reset_defaults() { } function torbutton_toggle_slider(doc, pos) { - let slider = doc.getElementById("torbutton_sec_slider"); - // onclick is active even if the element it belongs to is disabled. - if (pos && !slider.disabled) { - slider.value = pos; - } else { - if (doc.getElementById("torbutton_sec_custom").checked) { - slider.disabled = true; - slider.setAttribute("movetoclick", false); - } else { - slider.disabled = false; - slider.setAttribute("movetoclick", true); - } + doc.getElementById("torbutton_sec_slider").value = pos; + // Make sure the custom checkbox is unchecked as the user seems to want one + // of the defined security levels. + let sec_custom = doc.getElementById("torbutton_sec_custom"); + if (sec_custom.checked) { + sec_custom.checked = false; } } diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index cb5f1ab..57b013a 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -188,7 +188,6 @@ </hbox> <hbox> <checkbox id="torbutton_sec_custom" flex="1" - oncommand="torbutton_toggle_slider(document, 0);" label="&torbutton.prefs.sec_custom;"/> </hbox> </groupbox>

1 0

[torbutton/master] Bug 9387: Be smarter when leaving custom mode
by mikeperry＠torproject.org 10 Feb '15

10 Feb '15

commit a717611c4d067d77f561781f37d4d90196262f5b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 4 16:55:55 2015 +0000 Bug 9387: Be smarter when leaving custom mode We are leaving custom mode now if the user manages it to undo all security slider related preference changes manually. If, on the other hand, the user changes a relevant preference while being in one of the four regular slider modes we don't bother checking all preferences and switch to the custom mode immediately. --- src/chrome/content/torbutton.js | 183 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 172 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9cdb792..99b3e50 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -243,17 +243,29 @@ var torbutton_unique_pref_observer = case "media.opus.enabled": case "media.wave.enabled": case "media.apple.mp3.enabled": - // XXX: This logic is bad.. Instead, we need a check here - // that only sets custom if the prefs differ from the current - // security slider level (and also can set it back if they are the same). + // |m_tb_slider_update| is only set if the user updated a + // preference under control of the security slider via the + // slider on the Torbutton dialog. This in turn means we can + // skip the code dealing with setting/unsetting the custom mode + // in this case. if (!m_tb_sliderUpdate) { - // Do we already have custom settings? - let customSlider = m_tb_prefs. - getBoolPref("extensions.torbutton.security_custom"); - if (!customSlider) { - m_tb_prefs. - setBoolPref("extensions.torbutton.security_custom", true); - } + // Do we already have custom settings? + let customSlider = m_tb_prefs. + getBoolPref("extensions.torbutton.security_custom"); + // A preference governed by the security slider got changed + // but we are not in custom mode yet. Change that. + if (!customSlider) { + m_tb_prefs. + setBoolPref("extensions.torbutton.security_custom", + true); + } else { + // We are in custom mode. Check whether all prefs are + // reset and reset the mode if so. Otherwise we remain + // in custom mode. + torbutton_log(4, "custom mode and we got: " + data); + torbutton_security_slider_custom_check(m_tb_prefs. + getIntPref("extensions.torbutton.security_slider")); + } } break; } @@ -2272,7 +2284,7 @@ function torbutton_update_security_slider() { m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) // noscript.globalHttpsWhitelist is special: We don't want it in this // mode. - if (p == "noscript.globalHttpsWhitelist") { + if (p === "noscript.globalHttpsWhitelist") { m_tb_prefs.setBoolPref(p, !torbutton_sec_mh_bool_prefs[p]) } } @@ -2293,6 +2305,155 @@ function torbutton_update_security_slider() { m_tb_sliderUpdate = false; } +// The user (re)set a pref which is relevant to the security slider while she +// was in custom mode. Check whether the preference values fit to the mode which +// is still on the slider. Iff so, we are leaving the custom mode. +function torbutton_security_slider_custom_check(mode) { + let capValue = m_tb_prefs.getCharPref("capability.policy.maonoscript.sites"); + switch (mode) { + case 1: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { + return; + } + } + if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { + + if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } else { + if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + case 2: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_mh_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { + return; + } + } + if (m_tb_prefs.getCharPref("general.useragent.locale") !== "ko" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "vi" || + m_tb_prefs.getCharPref("general.useragent.locale") !== "zh-CN") { + + if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } else { + if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + case 3: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) === torbutton_sec_h_bool_prefs[p]) { + // We have the whitelist and JavaScript is disabled in medium-high + // mode as well. + if (p === "noscript.global") { + continue; + } + return; + } + } + if (m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + case 4: + for (p in torbutton_sec_l_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_l_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_ml_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_ml_bool_prefs[p]) { + return; + } + } + for (p in torbutton_sec_mh_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_mh_bool_prefs[p]) { + // We don't want to have the whitelist in high mode. JavaScript is + // disabled globally. + if (p === "noscript.globalHttpsWhitelist") { + continue; + } + return; + } + } + for (p in torbutton_sec_h_bool_prefs) { + if (m_tb_prefs.getBoolPref(p) !== torbutton_sec_h_bool_prefs[p]) { + return; + } + } + if (!m_tb_prefs.getBoolPref("gfx.font_rendering.graphite.enabled")) { + return; + } + // We are still here which means all preferences are properly reset. Leave + // custom mode. + m_tb_prefs.setBoolPref("extensions.torbutton.security_custom", false); + break; + } +} + // Bug 1506 P0: This code is a toggle-relic. // // It basically just enforces the three Torbutton prefs

1 0

[tor-browser-bundle/master] Bug 14526: Merge of #8405 breaks nightly builds
by gk＠torproject.org 30 Jan '15

30 Jan '15

commit ad82b1ef6f99a8468e6e02c0977546a23bd0149c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 11:27:17 2015 +0000 Bug 14526: Merge of #8405 breaks nightly builds --- gitian/descriptors/linux/gitian-tor.yml | 3 ++- gitian/descriptors/mac/gitian-tor.yml | 3 ++- gitian/descriptors/windows/gitian-tor.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index f9795ea..87f3f10 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -80,7 +80,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 9cedf67..a772a74 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -58,7 +58,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index dce98f8..9cbbb86 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -58,7 +58,8 @@ script: | then git am ~/build/bug8405.patch git am ~/build/bug8402-master.patch - else # 0.2.6 and master + elif [ ${TOR_TAG::9} == "tor-0.2.6" ]; + then git am ~/build/bug8405.patch fi mkdir -p $OUTDIR/src

1 0

[tor-browser-bundle/master] Bump NoScript version in nightlies
by gk＠torproject.org 30 Jan '15

30 Jan '15

commit ab91d616e7eb015b1ca54e3130be85c302963d09 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 30 09:21:35 2015 +0000 Bump NoScript version in nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4be76d8..16519f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -61,7 +61,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.11-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -91,7 +91,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 +NOSCRIPT_HASH=568122b4834baf2113648317baf294879700178df157780a9c89582280338ba8 HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'linus/stupid-sender-bug'
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit 437e1beec2207dca79c2917b55b6f3a468150d7f Merge: e64e8d5 cb71808 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 28 14:12:22 2015 +0000 Merge remote-tracking branch 'linus/stupid-sender-bug' tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-bundle/master] Fix stupid LOGSENDER bug.
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit cb718087cb08049ea3f672ac0461d7a1055ed267 Author: Linus Nordberg <linus(a)torproject.org> Date: Wed Jan 28 14:07:26 2015 +0100 Fix stupid LOGSENDER bug. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 271f1ec..434d61b 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -73,6 +73,6 @@ else ../../gitian-builder/var/build.log \ ../../gitian-builder/var/target.log" tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date +%F)" \ - $sender -- $LOGRECIPIENTS + $LOGSENDER -- $LOGRECIPIENTS fi fi

1 0

[tor-browser-bundle/maint-4.0] Bug 14420: Also verify OpenSSL during tag check.
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit 7082e1ff92942409eea40a7d19b5bba25a9a0272 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 27 09:30:00 2015 -0800 Bug 14420: Also verify OpenSSL during tag check. --- gitian/verify-tags.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index b7a89f1..c9e9a0f 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -116,12 +116,12 @@ faketime $FAKETIME_TAG EOF # Verify signatures on signed packages -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" ]; then + "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig"

1 0

[tor-browser-bundle/maint-4.0] Bug #14420: Remove old auth cruft from fetch-inputs.sh
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit d4cfa02d22cefb43a5b66e6f0d10a876a78a3b33 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 27 08:03:44 2015 -0800 Bug #14420: Remove old auth cruft from fetch-inputs.sh --- gitian/fetch-inputs.sh | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index ef4dbf7..d4eee57 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -111,30 +111,13 @@ update_git() { } ############################################################################## -# Get package files from mirror - # Get+verify sigs that exist -for i in OPENSSL # OBFSPROXY -do - PACKAGE="${i}_PACKAGE" - URL="${MIRROR_URL}${!PACKAGE}" - SUFFIX="asc" - get "${!PACKAGE}" "$URL" - get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" - - if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then - echo "$i: GPG signature is broken for ${URL}" - mv "${!PACKAGE}" "${!PACKAGE}.badgpg" - exit 1 - fi -done - -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" ]; then + "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -179,29 +162,6 @@ do get "${!PACKAGE}" "${!URL}" done -# Verify packages with weak or no signatures via multipath downloads -# (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -# XXX: Google won't allow wget -N.. We need to re-download the whole -# TOOLCHAIN4 each time. Rely only on SHA256 for now.. -mkdir -p verify -cd verify -for i in OPENSSL OSXSDK -do - URL="${i}_URL" - PACKAGE="${i}_PACKAGE" - if ! wget -U "" -N --no-remove-listing "${!URL}"; then - echo "$i url ${!URL} is broken!" - mv "${!PACKAGE}" "${!PACKAGE}.removed" - exit 1 - fi - if ! diff "${!PACKAGE}" "../${!PACKAGE}"; then - echo "Package ${!PACKAGE} differs from our mirror's version!" - exit 1 - fi -done - -cd .. - # NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} wget -U "" -N ${HTTPSE_URL}

1 0

[tor-browser-bundle/master] Bug #14420: Remove old auth cruft from fetch-inputs.sh
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit 9a8c0663abb0359b743865bca24b22316bb16fac Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 27 08:05:16 2015 -0800 Bug #14420: Remove old auth cruft from fetch-inputs.sh --- gitian/fetch-inputs.sh | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 3311547..fdbbc69 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -112,30 +112,13 @@ update_git() { } ############################################################################## -# Get package files from mirror - # Get+verify sigs that exist -for i in OPENSSL # OBFSPROXY -do - PACKAGE="${i}_PACKAGE" - URL="${MIRROR_URL}${!PACKAGE}" - SUFFIX="asc" - get "${!PACKAGE}" "$URL" - get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" - - if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then - echo "$i: GPG signature is broken for ${URL}" - mv "${!PACKAGE}" "${!PACKAGE}.badgpg" - exit 1 - fi -done - -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" ]; then + "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig" @@ -189,29 +172,6 @@ do get "${!PACKAGE}" "${MIRROR_URL_YAWNING}${!PACKAGE}" done -# Verify packages with weak or no signatures via multipath downloads -# (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -# XXX: Google won't allow wget -N.. We need to re-download the whole -# TOOLCHAIN4 each time. Rely only on SHA256 for now.. -mkdir -p verify -cd verify -for i in OPENSSL OSXSDK -do - URL="${i}_URL" - PACKAGE="${i}_PACKAGE" - if ! wget -U "" -N --no-remove-listing "${!URL}"; then - echo "$i url ${!URL} is broken!" - mv "${!PACKAGE}" "${!PACKAGE}.removed" - exit 1 - fi - if ! diff "${!PACKAGE}" "../${!PACKAGE}"; then - echo "Package ${!PACKAGE} differs from our mirror's version!" - exit 1 - fi -done - -cd .. - # NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} wget -U "" -N ${HTTPSE_URL}

1 0

[tor-browser-bundle/master] Bug 14420: Also verify OpenSSL during tag check.
by gk＠torproject.org 28 Jan '15

28 Jan '15

commit e64e8d53b511525671d83d6d3631f82388b5e7bc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 27 09:30:00 2015 -0800 Bug 14420: Also verify OpenSSL during tag check. --- gitian/verify-tags.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 55bb857..df30143 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -120,12 +120,12 @@ goxcrypto $GO_X_CRYPTO_TAG EOF # Verify signatures on signed packages -for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +for i in OPENSSL BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML do PACKAGE="${i}_PACKAGE" URL="${i}_URL" if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ - "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" ]; then + "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" -o "${i}" == "OPENSSL" ]; then SUFFIX="asc" else SUFFIX="sig"

1 0

[tor-browser-bundle/maint-4.0] Bump OpenSSL to 1.0.1l.
by mikeperry＠torproject.org 26 Jan '15

26 Jan '15

commit 23d92a6a2dcf312767e8ca435a536d0aebb0867d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jan 26 13:40:34 2015 -0800 Bump OpenSSL to 1.0.1l. --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index ee4435c..d9135d3 100755 --- a/gitian/versions +++ b/gitian/versions @@ -30,7 +30,7 @@ FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1i +OPENSSL_VER=1.0.1l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -76,7 +76,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 +OPENSSL_HASH=b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/master] Bump OpenSSL to 1.0.1l for nightly and alpha.
by mikeperry＠torproject.org 26 Jan '15

26 Jan '15

commit e83b83eb7a12268cca0ec8b1b6d4bbc7aad03058 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jan 26 13:39:20 2015 -0800 Bump OpenSSL to 1.0.1l for nightly and alpha. --- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a0af194..e5668f2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -34,7 +34,7 @@ OBFS4_TAG=obfs4proxy-0.0.3 GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1i +OPENSSL_VER=1.0.1l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -82,7 +82,7 @@ GOCRYPTO_PACKAGE=go.crypto-5478be1963aa.tar.bz2 GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 +OPENSSL_HASH=b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index cb6e53a..4be76d8 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -38,7 +38,7 @@ OBFS4_TAG=master GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1i +OPENSSL_VER=1.0.1l GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -86,7 +86,7 @@ GOCRYPTO_PACKAGE=go.crypto-5478be1963aa.tar.bz2 GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 +OPENSSL_HASH=b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/master] Add goxcrypto to verifiy-tags.sh
by gk＠torproject.org 22 Jan '15

22 Jan '15

commit e0e53189158646aa2f01add172ec757ea7c1a921 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 22 09:26:08 2015 +0000 Add goxcrypto to verifiy-tags.sh --- gitian/verify-tags.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 09454bb..55bb857 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -116,6 +116,7 @@ txsocksx $TXSOCKSX_TAG faketime $FAKETIME_TAG ed25519 $GOED25519_TAG siphash $GOSIPHASH_TAG +goxcrypto $GO_X_CRYPTO_TAG EOF # Verify signatures on signed packages

1 0

[tor-browser-bundle/master] Add golang.org/x/crypto to the build process.
by gk＠torproject.org 22 Jan '15

22 Jan '15

commit e33339c763c212a09f9976d5c04f033c1ec7c18c Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Jan 21 19:34:00 2015 +0000 Add golang.org/x/crypto to the build process. This is required for any of: * Go >= 1.4.x (It is backwards compatible though). * obfs4proxy >= cdeda5724124ca393c87be6d01c84fe4f906d612 And replaces go.crypto (the developers moved/renamed the package). As there is no formal release process as far as I can tell for the codebase the current tip of tree commit is used for versions.alpha, and master for versions.nightly. When obfs4proxy 0.0.4 is tagged, the old go.crypto code can be removed from the build process after the new tag is added to all the versions.foo files. Fixes #14316. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 14 +++++++++++++- gitian/descriptors/mac/gitian-pluggable-transports.yml | 14 +++++++++++++- .../descriptors/windows/gitian-pluggable-transports.yml | 14 +++++++++++++- gitian/fetch-inputs.sh | 1 + gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 9 files changed, 45 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index e79e8af..d180f97 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -36,6 +36,8 @@ remotes: "dir": "ed25519" - "url": "https://github.com/dchest/siphash.git" "dir": "siphash" +- "url": "https://go.googlesource.com/crypto" + "dir": "goxcrypto" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -242,7 +244,17 @@ script: | go install github.com/dchest/siphash cd .. - # Building go.crypto + # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) + cd goxcrypto + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" + go install golang.org/x/crypto/curve25519 + go install golang.org/x/crypto/hkdf + go install golang.org/x/crypto/nacl/secretbox + cd .. + + # Building go.crypto (obfs4proxy <= 0.0.3) tar xjf go.crypto.tar.bz2 cd go.crypto find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 0931c59..9a86b1a 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -34,6 +34,8 @@ remotes: "dir": "ed25519" - "url": "https://github.com/dchest/siphash.git" "dir": "siphash" +- "url": "https://go.googlesource.com/crypto" + "dir": "goxcrypto" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -270,7 +272,17 @@ script: | go install github.com/dchest/siphash cd .. - # Building go.crypto + # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) + cd goxcrypto + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" + go install golang.org/x/crypto/curve25519 + go install golang.org/x/crypto/hkdf + go install golang.org/x/crypto/nacl/secretbox + cd .. + + # Building go.crypto (obfs4proxy <= 0.0.3) tar xjf go.crypto.tar.bz2 cd go.crypto find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 70d4b91..6e3c3a7 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -33,6 +33,8 @@ remotes: "dir": "ed25519" - "url": "https://github.com/dchest/siphash.git" "dir": "siphash" +- "url": "https://go.googlesource.com/crypto" + "dir": "goxcrypto" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -348,7 +350,17 @@ script: | go install github.com/dchest/siphash cd .. - # Building go.crypto + # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) + cd goxcrypto + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" + go install golang.org/x/crypto/curve25519 + go install golang.org/x/crypto/hkdf + go install golang.org/x/crypto/nacl/secretbox + cd .. + + # Building go.crypto (obfs4proxy <= 0.0.3) tar xjf go.crypto.tar.bz2 cd go.crypto find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 049824a..3311547 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -309,6 +309,7 @@ meek https://git.torproject.org/pluggable-transports/meek.git $ faketime https://github.com/wolfcw/libfaketime $FAKETIME_TAG ed25519 https://github.com/agl/ed25519.git $GOED25519_TAG siphash https://github.com/dchest/siphash.git $GOSIPHASH_TAG +goxcrypto https://go.googlesource.com/crypto $GO_X_CRYPTO_TAG obfs4 https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG EOF diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 4a773b8..0dba906 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -224,7 +224,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index ed54dc6..09b3172 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -190,7 +190,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 945511b..39c57ce 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -194,7 +194,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 890b6a3..a0af194 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -29,6 +29,7 @@ MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd +GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 OBFS4_TAG=obfs4proxy-0.0.3 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d200f54..cb6e53a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -33,6 +33,7 @@ MEEK_TAG=master FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd +GO_X_CRYPTO_TAG=master OBFS4_TAG=master GITIAN_TAG=tor-browser-builder-3.x-7

1 0

[tor-browser-bundle/master] Bump Firefox, NoScript, HTTPS-E version for nightly
by gk＠torproject.org 21 Jan '15

21 Jan '15

commit 364e84e7d4ecdb889ed7e00fddbd30bdf68cc7ea Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 21 09:08:02 2015 +0000 Bump Firefox, NoScript, HTTPS-E version for nightly --- gitian/versions.nightly | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 14093cb..d200f54 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,7 +7,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.3.0esr +FIREFOX_VERSION=31.4.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -40,7 +40,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -54,13 +54,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0development.1 +HTTPSE_VER=5.0development.2 GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.5-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -90,8 +90,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a -HTTPSE_HASH=d97ec822641d4ebf404fee1179497e1d80f2b8344d5fa485169ef045ba184db0 +NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 +HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Fix emailing of log files and remove a couple of default values.
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit db856ac0155791bbca283da574b14ed4ae5bd515 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Jan 20 16:32:36 2015 +0100 Fix emailing of log files and remove a couple of default values. --- tools/continuous-builds/build-tbb.sh | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 010b41d..ab8d36f 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -18,12 +18,29 @@ BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET N=$6; [ -z "$N" ] && N=16 -[ -z "$PGPKEYID" ] && PGPKEYID=0x984496E7 +# Set PGPKEYID="--local-user KEY-ID" to override default PGP key used +# for signing. +[ -z "$PGPKEYID" ] && PGPKEYID="" +# mail(1) from Debian package bsd-mailx lost `-f envelope-sender' in +# DSA-3104-1. Install package heirloom-mailx and set +# MAILX=/usr/bin/heirloom-mailx in order to override envelope sender +# using `-r' in LOGSENDER. +[ -z "$MAILX" ] && MAILX="" + +# Name of log file. logfile=$(date -u +%s).log -logrecipients="gk(a)torproject.org linus(a)torproject.org" -. ~/setup-gitian-build-env.sh +# LOGRECIPIENTS is a space separated list of email addresses or an +# empty string. +[ -z "$LOGRECIPIENTS" ] && LOGRECIPIENTS="" + +# Set LOGSENDER to "-r user@domain" to override envelope sender. If +# empty the default envelope sender is used. +[ -z "$LOGSENDER" ] && LOGSENDER="" + +[ -f ~/setup-gitian-build-env.sh ] && . ~/setup-gitian-build-env.sh + cd $BUILDDIR || exit 1 status=init n=0 @@ -45,11 +62,17 @@ if [ $status = done ]; then mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums.txt - gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 + gpg -a --clearsign $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe $D/*.dmg | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile - tail -n 50 $logfile ../../gitian-builder/var/build.log ../../gitian-builder/var/target.log | mail -s "Nightly build failure -- $(date +%F)" $logrecipients + if [ -n "$LOGRECIPIENTS" ]; then + FILES="$logfile \ + ../../gitian-builder/var/build.log \ + ../../gitian-builder/var/target.log" + tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date +%F)" \ + $sender -- $LOGRECIPIENTS + fi fi

1 0

[tor-browser-bundle/master] Fix a log printout.
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit d39450e0386b211b7e813d43320100067e08f0e6 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Jan 20 16:42:58 2015 +0100 Fix a log printout. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index ab8d36f..271f1ec 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -51,7 +51,7 @@ while [ $status != done ]; do date | tee -a $logfile killall qemu-system-i386 qemu-system-x86_64 make $MAKE_TARGET > build-$(date -u +%s).log && status=done - printf "%s: Tried building $TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile + printf "%s: Tried building $MAKE_TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile MAKE_TARGET=build-$TARGET [ $n -ge $N ] && break done

1 0

[tor-browser-bundle/master] Bug 14303: Adapt fix for #13015 to signing script
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit c2f819863f5dd5031346fd483c7adf2d77bec42e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 20 11:41:44 2015 +0000 Bug 14303: Adapt fix for #13015 to signing script --- gitian/signmars.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/signmars.sh b/gitian/signmars.sh index fdb531e..ed42971 100755 --- a/gitian/signmars.sh +++ b/gitian/signmars.sh @@ -30,6 +30,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) export LC_ALL=C

1 0

[tor-browser-bundle/master] Fix Changelog
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit df55f898a05620110275c3e6e72c3cfbc54aca3d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 20 11:36:02 2015 +0000 Fix Changelog --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7416e0c..2dd58e7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 4.5-alpha-3 -- Jan 16 2015 +Tor Browser 4.5a3 -- Jan 19 2015 * All Platforms * Update Firefox to 31.4.0esr * Update Tor to 0.2.6.2-alpha @@ -16,6 +16,7 @@ Tor Browser 4.5-alpha-3 -- Jan 16 2015 * Bug 13671: Fixup for circuit display if bridges are used * Translation updates * Update Tor Launcher to 0.2.7.1 + * Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set * Translation updates * Bug 13379: Sign our MAR files * Bug 13788: Fix broken meek in 4.5-alpha series

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Fixup! Bug #9701: Prevent ClipBoardCache from writing to disk.
by brade＠torproject.org 19 Jan '15

19 Jan '15

commit a78a094886091a90e5f4e13c0579f9ad730ea8b5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jan 19 16:45:26 2015 -0500 Fixup! Bug #9701: Prevent ClipBoardCache from writing to disk. Update the DataStruct::SetData() prototype (my clang-based Mac build failed). --- widget/xpwidgets/nsTransferable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widget/xpwidgets/nsTransferable.h b/widget/xpwidgets/nsTransferable.h index 4c80bfe..73dcf49 100644 --- a/widget/xpwidgets/nsTransferable.h +++ b/widget/xpwidgets/nsTransferable.h @@ -27,7 +27,7 @@ struct DataStruct ~DataStruct(); const nsCString& GetFlavor() const { return mFlavor; } - void SetData( nsISupports* inData, uint32_t inDataLen ); + void SetData( nsISupports* inData, uint32_t inDataLen, bool aIsPrivBrowsing ); void GetData( nsISupports** outData, uint32_t *outDataLen ); already_AddRefed<nsIFile> GetFileSpec(const char* aFileName); bool IsDataAvailable() const { return (mData && mDataLen > 0) || (!mData && mCacheFileName); }

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Revert "Bug #9701: Prevent ClipBoardCache from writing to disk."
by brade＠torproject.org 19 Jan '15

19 Jan '15

commit ba4eca38fdad352c564719ff49aaa8c87e8a8ded Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jan 19 16:01:11 2015 -0500 Revert "Bug #9701: Prevent ClipBoardCache from writing to disk." This reverts commit ba34a65a5e33473cb6f53b06542a3ce087c26115. An improved fix is forthcoming. --- widget/xpwidgets/nsTransferable.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/xpwidgets/nsTransferable.cpp index e6af15e..094836b 100644 --- a/widget/xpwidgets/nsTransferable.cpp +++ b/widget/xpwidgets/nsTransferable.cpp @@ -58,7 +58,6 @@ DataStruct::~DataStruct() void DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen ) { -#if 0 // Remove unnecessary disk caching to accommodate https://www.torproject.org/projects/torbrowser/design/#disk-avoidance // Now, check to see if we consider the data to be "too large" if (aDataLen > kLargeDatasetSize) { // if so, cache it to disk instead of memory @@ -67,7 +66,6 @@ DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen ) else NS_WARNING("Oh no, couldn't write data to the cache file"); } -#endif // #if 0 mData = aData; mDataLen = aDataLen;

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug #9701: Prevent ClipBoardCache from writing to disk.
by brade＠torproject.org 19 Jan '15

19 Jan '15

commit 453b4ee4b2cd1c3dd22ee2040b38f09d26e8a60f Author: Michael Schloh von Bennewitz <michael(a)schloh.com> Date: Mon Jan 19 16:04:36 2015 -0500 Bug #9701: Prevent ClipBoardCache from writing to disk. Do not write clipboard data to disk when private browsing mode is on. --- widget/xpwidgets/nsTransferable.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/xpwidgets/nsTransferable.cpp index 094836b..1a0e96e 100644 --- a/widget/xpwidgets/nsTransferable.cpp +++ b/widget/xpwidgets/nsTransferable.cpp @@ -56,19 +56,20 @@ DataStruct::~DataStruct() //------------------------------------------------------------------------- void -DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen ) +DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen, bool aIsPrivBrowsing ) { // Now, check to see if we consider the data to be "too large" - if (aDataLen > kLargeDatasetSize) { + // as well as ensuring that private browsing mode is disabled + if (aDataLen > kLargeDatasetSize && !aIsPrivBrowsing) { // if so, cache it to disk instead of memory if ( NS_SUCCEEDED(WriteCache(aData, aDataLen)) ) return; else - NS_WARNING("Oh no, couldn't write data to the cache file"); - } + NS_WARNING("Oh no, couldn't write data to the cache file"); + } mData = aData; - mDataLen = aDataLen; + mDataLen = aDataLen; } @@ -401,7 +402,7 @@ nsTransferable::SetTransferData(const char *aFlavor, nsISupports *aData, uint32_ for (i = 0; i < mDataArray.Length(); ++i) { DataStruct& data = mDataArray.ElementAt(i); if ( data.GetFlavor().Equals(aFlavor) ) { - data.SetData ( aData, aDataLen ); + data.SetData ( aData, aDataLen, mPrivateData ); return NS_OK; } } @@ -417,7 +418,7 @@ nsTransferable::SetTransferData(const char *aFlavor, nsISupports *aData, uint32_ nsCOMPtr<nsISupports> ConvertedData; uint32_t ConvertedLen; mFormatConv->Convert(aFlavor, aData, aDataLen, data.GetFlavor().get(), getter_AddRefs(ConvertedData), &ConvertedLen); - data.SetData(ConvertedData, ConvertedLen); + data.SetData(ConvertedData, ConvertedLen, mPrivateData); return NS_OK; } }

1 0

[tor-browser-bundle/master] Use version 4.5a3 for incrementals
by mikeperry＠torproject.org 15 Jan '15

15 Jan '15

commit 5cc63b2a6c8469be17c976b0008f53693c9419ae Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jan 15 06:44:37 2015 -0800 Use version 4.5a3 for incrementals --- tools/update-responses/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 37c0ead..7f1d7c9 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,12 +6,12 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 4.5-alpha-3 + alpha: 4.5a3 versions: - 4.5-alpha-3: + 4.5a3: platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-3 + download_url: https://www.torproject.org/dist/torbrowser/4.5a3 incremental_from: - 4.5-alpha-2 migrate_archs:

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit b491f6d4bacdbc07d8003f8d6a79e4ffeb775988 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 19 17:26:48 2014 -0800 fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers. This fixes the meek breakage reported in #13788. --- netwerk/base/src/nsSocketTransport2.cpp | 87 +++++++++---------------------- netwerk/base/src/nsSocketTransport2.h | 14 +++-- 2 files changed, 31 insertions(+), 70 deletions(-) diff --git a/netwerk/base/src/nsSocketTransport2.cpp b/netwerk/base/src/nsSocketTransport2.cpp index ea0dd68..baa14da 100644 --- a/netwerk/base/src/nsSocketTransport2.cpp +++ b/netwerk/base/src/nsSocketTransport2.cpp @@ -751,8 +751,7 @@ nsSocketTransport::nsSocketTransport() : mTypes(nullptr) , mTypeCount(0) , mPort(0) - , mHttpsProxy(false) - , mProxyUse(false) + , mProxyPort(0) , mProxyTransparent(false) , mProxyTransparentResolvesHost(false) , mConnectionFlags(0) @@ -813,26 +812,20 @@ nsSocketTransport::Init(const char **types, uint32_t typeCount, mHost = host; const char *proxyType = nullptr; + mProxyInfo = proxyInfo; if (proxyInfo) { - mProxyInfo = proxyInfo; + mProxyPort = proxyInfo->Port(); + mProxyHost = proxyInfo->Host(); // grab proxy type (looking for "socks" for example) proxyType = proxyInfo->Type(); if (proxyType && (strcmp(proxyType, "http") == 0 || strcmp(proxyType, "direct") == 0 || strcmp(proxyType, "unknown") == 0)) proxyType = nullptr; - - mProxyUse = true; - // check that we don't have a proxyInfo without proxy - nsCString proxyHost; - proxyInfo->GetHost(proxyHost); - if (!proxyType || proxyHost.IsEmpty()) { - mProxyUse = false; - } } - SOCKET_LOG(("nsSocketTransport::Init [this=%x host=%s:%hu proxy=%s]\n", - this, mHost.get(), mPort, mProxyUse ? "yes" : "no")); + SOCKET_LOG(("nsSocketTransport::Init [this=%p host=%s:%hu proxy=%s:%hu]\n", + this, mHost.get(), mPort, mProxyHost.get(), mProxyPort)); // include proxy type as a socket type if proxy type is not "http" mTypeCount = typeCount + (proxyType != nullptr); @@ -1005,7 +998,7 @@ nsSocketTransport::ResolveHost() nsresult rv; - if (mProxyUse) { + if (!mProxyHost.IsEmpty()) { if (!mProxyTransparent || mProxyTransparentResolvesHost) { #if defined(XP_UNIX) NS_ABORT_IF_FALSE(!mNetAddrIsSet || mNetAddr.raw.family != AF_LOCAL, @@ -1087,8 +1080,10 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us const char *host = mHost.get(); int32_t port = (int32_t) mPort; + const char *proxyHost = mProxyHost.IsEmpty() ? nullptr : mProxyHost.get(); + int32_t proxyPort = (int32_t) mProxyPort; uint32_t proxyFlags = 0; - nsCOMPtr<nsIProxyInfo> proxy = mProxyInfo; + nsCOMPtr<nsIProxyInfo> proxyInfo = mProxyInfo; uint32_t i; for (i=0; i<mTypeCount; ++i) { @@ -1109,19 +1104,12 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us if (mConnectionFlags & nsISocketTransport::NO_PERMANENT_STORAGE) proxyFlags |= nsISocketProvider::NO_PERMANENT_STORAGE; - nsCOMPtr<nsISupports> secinfo; if (i == 0) { // if this is the first type, we'll want the // service to allocate a new socket - nsCString proxyHost; - GetHost(proxyHost); - int32_t proxyPort; - GetPort(&proxyPort); rv = provider->NewSocket(mNetAddr.raw.family, - mHttpsProxy ? proxyHost.get() : host, - mHttpsProxy ? proxyPort : port, - proxy, + host, port, proxyInfo, proxyFlags, &fd, getter_AddRefs(secinfo)); @@ -1135,7 +1123,7 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us // so we just want the service to add itself // to the stack (such as pushing an io layer) rv = provider->AddToSocket(mNetAddr.raw.family, - host, port, proxy, + host, port, proxyInfo, proxyFlags, fd, getter_AddRefs(secinfo)); } @@ -1165,7 +1153,9 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us (strcmp(mTypes[i], "socks4") == 0)) { // since socks is transparent, any layers above // it do not have to worry about proxy stuff - proxy = nullptr; + proxyInfo = nullptr; + proxyHost = nullptr; + proxyPort = -1; proxyTransparent = true; } } @@ -1224,14 +1214,10 @@ nsSocketTransport::InitiateSocket() netAddrCString.BeginWriting(), kIPv6CStrBufSize)) netAddrCString = NS_LITERAL_CSTRING("<IP-to-string failed>"); - nsCString proxyHost; - GetHost(proxyHost); - int32_t proxyPort; - GetPort(&proxyPort); SOCKET_LOG(("nsSocketTransport::InitiateSocket skipping " "speculative connection for host [%s:%d] proxy " "[%s:%d] with Local IP address [%s]", - mHost.get(), mPort, proxyHost.get(), proxyPort, + mHost.get(), mPort, mProxyHost.get(), mProxyPort, netAddrCString.get())); } #endif @@ -1380,7 +1366,7 @@ nsSocketTransport::InitiateSocket() // OnSocketConnected(); - if (mSecInfo && mProxyUse && proxyTransparent && usingSSL) { + if (mSecInfo && !mProxyHost.IsEmpty() && proxyTransparent && usingSSL) { // if the connection phase is finished, and the ssl layer has // been pushed, and we were proxying (transparently; ie. nothing // has to happen in the protocol layer above us), it's time for @@ -1404,7 +1390,8 @@ nsSocketTransport::InitiateSocket() // the OS error // else if (PR_UNKNOWN_ERROR == code && - mProxyUse && mProxyTransparent) { + mProxyTransparent && + !mProxyHost.IsEmpty()) { code = PR_GetOSError(); rv = ErrorAccordingToNSPR(code); } @@ -1413,7 +1400,7 @@ nsSocketTransport::InitiateSocket() // else { rv = ErrorAccordingToNSPR(code); - if (rv == NS_ERROR_CONNECTION_REFUSED && mProxyUse) + if ((rv == NS_ERROR_CONNECTION_REFUSED) && !mProxyHost.IsEmpty()) rv = NS_ERROR_PROXY_CONNECTION_REFUSED; } } @@ -1725,8 +1712,8 @@ nsSocketTransport::OnSocketEvent(uint32_t type, nsresult status, nsISupports *pa // For SOCKS proxies (mProxyTransparent == true), the socket // transport resolves the real host here, so there's no fixup // (see bug 226943). - if (status == NS_ERROR_UNKNOWN_HOST && !mProxyTransparent && - mProxyUse) + if ((status == NS_ERROR_UNKNOWN_HOST) && !mProxyTransparent && + !mProxyHost.IsEmpty()) mCondition = NS_ERROR_UNKNOWN_PROXY_HOST; else mCondition = status; @@ -1851,7 +1838,8 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) // The SOCKS proxy rejected our request. Find out why. // else if (PR_UNKNOWN_ERROR == code && - mProxyUse && mProxyTransparent) { + mProxyTransparent && + !mProxyHost.IsEmpty()) { code = PR_GetOSError(); mCondition = ErrorAccordingToNSPR(code); } @@ -1860,7 +1848,7 @@ nsSocketTransport::OnSocketReady(PRFileDesc *fd, int16_t outFlags) // else, the connection failed... // mCondition = ErrorAccordingToNSPR(code); - if (mCondition == NS_ERROR_CONNECTION_REFUSED && mProxyUse) + if ((mCondition == NS_ERROR_CONNECTION_REFUSED) && !mProxyHost.IsEmpty()) mCondition = NS_ERROR_PROXY_CONNECTION_REFUSED; SOCKET_LOG((" connection failed! [reason=%x]\n", mCondition)); } @@ -2183,31 +2171,6 @@ nsSocketTransport::GetPort(int32_t *port) return NS_OK; } -const nsCString & -nsSocketTransport::SocketHost() -{ - if (mProxyInfo && !mProxyTransparent) { - if (mProxyHostCache.IsEmpty()) { - mProxyInfo->GetHost(mProxyHostCache); - } - return mProxyHostCache; - } - else - return mHost; -} - -uint16_t -nsSocketTransport::SocketPort() -{ - if (mProxyInfo && !mProxyTransparent) { - int32_t result; - mProxyInfo->GetPort(&result); - return (uint16_t) result; - } - else - return mPort; -} - NS_IMETHODIMP nsSocketTransport::GetPeerAddr(NetAddr *addr) { diff --git a/netwerk/base/src/nsSocketTransport2.h b/netwerk/base/src/nsSocketTransport2.h index 73f750e..25f2592 100644 --- a/netwerk/base/src/nsSocketTransport2.h +++ b/netwerk/base/src/nsSocketTransport2.h @@ -266,18 +266,16 @@ private: char **mTypes; uint32_t mTypeCount; nsCString mHost; + nsCString mProxyHost; uint16_t mPort; - bool mHttpsProxy; - nsCOMPtr<nsIProxyInfo> mProxyInfo; - bool mProxyUse; - bool mProxyTransparent; - bool mProxyTransparentResolvesHost; + uint16_t mProxyPort; + bool mProxyTransparent; + bool mProxyTransparentResolvesHost; uint32_t mConnectionFlags; - uint16_t SocketPort(); - const nsCString &SocketHost(); - nsCString mProxyHostCache; // for SocketHost() only + uint16_t SocketPort() { return (!mProxyHost.IsEmpty() && !mProxyTransparent) ? mProxyPort : mPort; } + const nsCString &SocketHost() { return (!mProxyHost.IsEmpty() && !mProxyTransparent) ? mProxyHost : mHost; } //------------------------------------------------------------------------- // members accessible only on the socket transport thread:

1 0

[tor-browser-bundle/master] Bug 10125: Add instructions and checks for Debian
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit 2cf050b593ac68a25acc8fb4dbc79d75b6486c96 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 16:40:45 2015 +0000 Bug 10125: Add instructions and checks for Debian --- gitian/README.build | 2 +- gitian/check-prerequisites.sh | 55 +++++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index b51fd96..4caf690 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -1,6 +1,6 @@ QuickStart: - On an Ubuntu 12.04+ machine or VM, run: + On an Ubuntu 12.04+/Debian Wheezy+ machine or VM, run: $ make diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 62167e9..c59ede0 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -6,18 +6,57 @@ if [ ! -f /etc/debian_version ]; then echo "Gitian is dependent upon the Ubuntu Virtualization Tools." echo - echo "You need to run Ubuntu 12.04 LTS or newer." + echo "You need to run Ubuntu 12.04 LTS/Debian Wheezy or newer." exit 1 fi -dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null +DISTRO=`cat /etc/issue | grep -Eo 'Ubuntu|Debian*'` -if [ $? -ne 0 ]; then - echo "You are missing one or more Gitian build tool dependencies." - echo - echo "Please run:" - echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" +if [ $DISTRO = "Ubuntu" ]; +then + dpkg -s ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null + + if [ $? -ne 0 ]; + then + echo "You are missing one or more Gitian build tool dependencies." + echo + echo "Please run:" + echo " sudo apt-get install torsocks tor" + echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion" + exit 1 + fi +elif [ $DISTRO = "Debian" ]; +then + dpkg -s ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip torsocks tor python-cheetah debootstrap parted kpartx rsync 2>/dev/null >/dev/null + + if [ $? -ne 0 ]; + then + echo "You are missing one or more Gitian build tool dependencies." + echo + echo "Please run" + echo " sudo apt-get install torsocks tor" + echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip" + exit 1 + fi + + # python-vm-builder is special as we don't have a Debian package for it. + vmbuilder --help 2>/dev/null >/dev/null + if [ $? -ne 0 ]; + then + echo "The VM tool python-vm-builder is missing." + echo + echo "Please run" + echo 'torsocks wget -U "" http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12…' + echo 'echo "ec12e0070a007989561bfee5862c89a32c301992dd2771c4d5078ef1b3014f03 vm-builder_0.12.4+bzr489.orig.tar.gz" | sha256sum -c' + echo "# (verification -- must return OK)" + echo "tar -zxvf vm-builder_0.12.4+bzr489.orig.tar.gz" + echo "cd vm-builder-0.12.4+bzr489" + echo "sudo python setup.py install" + echo "cd .." + exit 1 + fi +else + echo "We need Debian or Ubuntu which seem to be missing. Aborting." exit 1 fi

1 0

[tor-browser-bundle/master] Bug #10125: Add Debian deps to recommended apt-get command
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit 003143681ca452c719bac0ecc23f14db4292efe3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jan 14 09:42:36 2015 -0800 Bug #10125: Add Debian deps to recommended apt-get command --- gitian/check-prerequisites.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index c59ede0..6111125 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -35,7 +35,7 @@ then echo echo "Please run" echo " sudo apt-get install torsocks tor" - echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip" + echo " sudo torsocks apt-get install ruby git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot zip unzip python-cheetah debootstrap parted kpartx rsync" exit 1 fi

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug #13749.2: Regression tests for first-party isolation of cache
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit c102a828cc194fa7a7eb4ffd5d01d7c5810033f3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Dec 15 02:35:03 2014 -0800 Bug #13749.2: Regression tests for first-party isolation of cache This test ensures that if first-party isolation is enabled ("privacy.thirdparty.isolate" pref is set to 2) then when a loaded file is cached, it is indexed by the URL-bar domain. In this test, a number of files are loaded (via IFRAME, LINK, SCRIPT, IMG, OBJECT, EMBED, AUDIO, VIDEO, TRACK and XMLHttpRequest) by parent pages with different URL bar domains. When isolation is active, we test to confirm that a separate copy of each file is cached for each different parent domain. We also test to make sure that when isolation is inactive, a single copy of the child page is cached and reused for all parent domains. --- netwerk/test/browser/browser.ini | 14 ++ netwerk/test/browser/browser_cacheFirstParty.js | 157 ++++++++++++++++++++++ netwerk/test/browser/firstPartyGrandParent.html | 10 ++ netwerk/test/browser/firstPartyParent.html | 38 ++++++ netwerk/test/browser/thirdPartyChild.audio.ogg | Bin 0 -> 2603 bytes netwerk/test/browser/thirdPartyChild.embed.png | Bin 0 -> 95 bytes netwerk/test/browser/thirdPartyChild.iframe.html | 13 ++ netwerk/test/browser/thirdPartyChild.img.png | Bin 0 -> 95 bytes netwerk/test/browser/thirdPartyChild.link.css | 1 + netwerk/test/browser/thirdPartyChild.object.png | Bin 0 -> 95 bytes netwerk/test/browser/thirdPartyChild.script.js | 1 + netwerk/test/browser/thirdPartyChild.track.vtt | 13 ++ netwerk/test/browser/thirdPartyChild.video.ogv | Bin 0 -> 16049 bytes netwerk/test/browser/thirdPartyChild.xhr.html | 8 ++ 14 files changed, 255 insertions(+) diff --git a/netwerk/test/browser/browser.ini b/netwerk/test/browser/browser.ini index a5f31f9..cae28f7 100644 --- a/netwerk/test/browser/browser.ini +++ b/netwerk/test/browser/browser.ini @@ -1,3 +1,17 @@ [DEFAULT] +support-files = + firstPartyGrandParent.html + firstPartyParent.html + thirdPartyChild.link.css + thirdPartyChild.iframe.html + thirdPartyChild.script.js + thirdPartyChild.audio.ogg + thirdPartyChild.video.ogv + thirdPartyChild.embed.png + thirdPartyChild.img.png + thirdPartyChild.object.png + thirdPartyChild.xhr.html + thirdPartyChild.track.vtt +[browser_cacheFirstParty.js] [browser_NetUtil.js] diff --git a/netwerk/test/browser/browser_cacheFirstParty.js b/netwerk/test/browser/browser_cacheFirstParty.js new file mode 100644 index 0000000..673b8c9 --- /dev/null +++ b/netwerk/test/browser/browser_cacheFirstParty.js @@ -0,0 +1,157 @@ +// # URL-bar domain (first party) isolation test + +// This test ensures that if first-party isolation is enabled +// ("privacy.thirdparty.isolate" pref is set to 2) then when a loaded file is cached, +// it is indexed by the URL-bar domain. + +// In this test, a number of files are loaded (via IFRAME, LINK, SCRIPT, IMG, OBJECT, +// EMBED, AUDIO, VIDEO, TRACK and XMLHttpRequest) by parent pages with different URL bar +// domains. When isolation is active, we test to confirm that a separate copy of each file +// is cached for each different parent domain. We also test to make sure that when +// isolation is inactive, a single copy of the child page is cached and reused for all +// parent domains. + +// In this file, functions are defined in call stack order (later functions call earlier +// functions). Comments are formatted for docco. + +/* jshint esnext:true */ + +// __Mozilla utilities__. +const Cu = Components.utils; +const Ci = Components.interfaces; +Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/Task.jsm"); + +// __listen(target, eventType, timeoutMs, useCapture)__. +// Calls addEventListener on target, with the given eventType. +// Returns a Promise that resolves to an Event object, if the event fires. +// If a timeout occurs, then Promise is rejected with a "Timed out" error. +// For use with Task.jsm. +let listen = function (target, eventType, timeoutMs, useCapture) { + return new Promise(function (resolve, reject) { + let listenFunction = function (event) { + target.removeEventListener(eventType, listenFunction, useCapture); + resolve(event); + }; + target.addEventListener(eventType, listenFunction, useCapture); + window.setTimeout(() => reject(new Error("Timed out")), timeoutMs); + }); +}; + +// __copyObject(obj)__. +// Returns a shallow copy of an object. Works with JS native objects. +let copyObject = function (obj) { + let result = {}; + for (let k of Object.keys(obj)) { + result[k] = obj[k]; + } + return result; +}; + +// __cacheData()__. +// Returns the current state of the cache. +let cacheData = function () { + let devices = [], + cacheEntries = [], + cacheVisitor = { visitDevice : function (deviceID, deviceInfo) { + devices.push(copyObject(deviceInfo)); + return true; + }, + visitEntry : function (deviceID, entryInfo) { + cacheEntries.push(copyObject(entryInfo)); + return true; + }, + QueryInterface : function(iid) { + if (iid.equals(Ci.nsICacheVisitor)) return this; + } }; + Services.cache.visitEntries(cacheVisitor); + return { devices : devices, cacheEntries : cacheEntries }; +}; + +// __loadURLinNewTab(URL)__. +// Opens a new tab at a given URL, and waits for it to load. Times out after 5 sec. +// Returns a promise that resolves to the tab. (Task.jsm coroutine.) +let loadURLinNewTab = function* (URL) { + let tab = gBrowser.addTab(URL), + browser = gBrowser.getBrowserForTab(tab), + result = yield listen(browser, "load", 5000, true); + return tab; +}; + +// __countMatchingCacheEntries(cacheEntries, domain, fileSuffix)__. +// Reports how many cache entries contain a given domain name and file suffix. +let countMatchingCacheEntries = function (cacheEntries, domain, fileSuffix) { + return cacheEntries.map(entry => entry.key) + .filter(key => key.contains(domain)) + .filter(key => key.contains("thirdPartyChild." + fileSuffix)) + .length; +}; + +// __Constants__. +let privacyPref = "privacy.thirdparty.isolate", + parentPage = "/browser/netwerk/test/browser/firstPartyParent.html", + grandParentPage = "/browser/netwerk/test/browser/firstPartyGrandParent.html", + // Parent domains (the iframe "child" domain is example.net) + domains = ["test1", "test2"], + // We duplicate domains, to check that two pages with the same first party domain + // share cached embedded objects. + duplicatedDomains = [].concat(domains, domains), + // We will check cache for example.net content from + // iframe, link, script, img, object, embed, xhr, audio, video, track + suffixes = ["iframe.html", "link.css", "script.js", "img.png", "object.png", + "embed.png", "xhr.html", "audio.ogg", "video.ogv", "track.vtt" ]; + +// __checkCachePopulation(pref, numberOfDomains)__. +// Check if the number of entries found in the cache for each +// embedded file type matches the number we expect, given the +// number of domains and the isolation state. +let checkCachePopulation = function (pref, numberOfDomains) { + let expectedEntryCount = (pref === 2) ? (2 * numberOfDomains) : 1; + // Collect cache data. + let data = cacheData(); + for (let suffix of suffixes) { + let foundEntryCount = countMatchingCacheEntries(data.cacheEntries, "example.net", suffix), + result = (suffix.startsWith("video") || suffix.startsWith("audio")) ? + // Video and audio elements aren't always cached, so + // tolerate fewer cached copies. + (expectedEntryCount === 1 ? (foundEntryCount <= 1) : (foundEntryCount > 1)) : + (expectedEntryCount === foundEntryCount); + // Report results to mochitest + ok(result, "Cache entries expected for " + suffix + + ": " + expectedEntryCount); + } +}; + +// __test()__. +// The main testing function. +let test = function () { + waitForExplicitFinish(); + // Launch a Task.jsm coroutine so we can open tabs and wait for each of them to open, + // one by one. + Task.spawn(function* () { + // Keep original pref value for restoring after the tests. + let originalPrefValue = Services.prefs.getIntPref(privacyPref); + // Test the pref with both values: 2 (isolating by first party) or 0 (not isolating) + for (let pref of [2, 0]) { + // Clear the cache. + Services.cache2.clear(); + // Set the pref to desired value + Services.prefs.setIntPref(privacyPref, pref); + // Open test tabs + let tabs = []; + for (let domain of duplicatedDomains) { + tabs.push(yield loadURLinNewTab("http://" + domain + ".example.com" + parentPage)); + tabs.push(yield loadURLinNewTab("http://" + domain + ".example.org" + grandParentPage)); + } + // Run checks to make sure cache has expected number of entries for + // the chosen pref state. + checkCachePopulation(pref, domains.length); + // Clean up by removing tabs. + tabs.forEach(tab => gBrowser.removeTab(tab)); + } + // Restore the pref to its original value. + Services.prefs.setIntPref(privacyPref, originalPrefValue); + // All tests have now been run. + finish(); + }); +}; diff --git a/netwerk/test/browser/firstPartyGrandParent.html b/netwerk/test/browser/firstPartyGrandParent.html new file mode 100644 index 0000000..c990831 --- /dev/null +++ b/netwerk/test/browser/firstPartyGrandParent.html @@ -0,0 +1,10 @@ +<!DOCTYPE html> +<html> +<head> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> +</head> +<frameset cols="50%,50%"> + <frame src="http://example.net/browser/netwerk/test/browser/firstPartyParent.html"> + <frame src=""> +</frameset> +</html> diff --git a/netwerk/test/browser/firstPartyParent.html b/netwerk/test/browser/firstPartyParent.html new file mode 100644 index 0000000..7f2f5c8 --- /dev/null +++ b/netwerk/test/browser/firstPartyParent.html @@ -0,0 +1,38 @@ +<!DOCTYPE html> +<html> + +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> +<head> + <link rel="stylesheet" type="text/css" + href="http://example.net/browser/netwerk/test/browser/thirdPartyChild.link.css"> +</head> +<body> +<div>firstPartyParent.html</div> + +<iframe src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.iframe.html"> +</iframe> + +<script src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.script.js"> +</script> + +<img src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.img.png"> + +<embed src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.embed.png"> + +<object data="http://example.net/browser/netwerk/test/browser/thirdPartyChild.object.png" + type="image/png"></object> + +<audio id="audio" autoplay> + <source src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.audio.ogg" + type="audio/ogg"> + <track src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.track.vtt" + kind="subtitles"> +</audio> + +<video id="video" + src="http://example.net/browser/netwerk/test/browser/thirdPartyChild.video.ogv" + type="video/ogg"> +</video> + +</body> +</html> diff --git a/netwerk/test/browser/thirdPartyChild.audio.ogg b/netwerk/test/browser/thirdPartyChild.audio.ogg new file mode 100644 index 0000000..edda4e9 Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.audio.ogg differ diff --git a/netwerk/test/browser/thirdPartyChild.embed.png b/netwerk/test/browser/thirdPartyChild.embed.png new file mode 100644 index 0000000..c5916f2 Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.embed.png differ diff --git a/netwerk/test/browser/thirdPartyChild.iframe.html b/netwerk/test/browser/thirdPartyChild.iframe.html new file mode 100644 index 0000000..f7b7531 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.iframe.html @@ -0,0 +1,13 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.html</div> +<script> + var xhr = new XMLHttpRequest(); + xhr.open("GET", "http://example.net/browser/netwerk/test/browser/thirdPartyChild.xhr.html", true); + xhr.send(); +</script> +</body> +</html> diff --git a/netwerk/test/browser/thirdPartyChild.img.png b/netwerk/test/browser/thirdPartyChild.img.png new file mode 100644 index 0000000..c5916f2 Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.img.png differ diff --git a/netwerk/test/browser/thirdPartyChild.link.css b/netwerk/test/browser/thirdPartyChild.link.css new file mode 100644 index 0000000..cf8a82e --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.link.css @@ -0,0 +1 @@ +/* Dummy CSS file, used by browser_cacheFirstParty.js. */ \ No newline at end of file diff --git a/netwerk/test/browser/thirdPartyChild.object.png b/netwerk/test/browser/thirdPartyChild.object.png new file mode 100644 index 0000000..c5916f2 Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.object.png differ diff --git a/netwerk/test/browser/thirdPartyChild.script.js b/netwerk/test/browser/thirdPartyChild.script.js new file mode 100644 index 0000000..1cf2937 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.script.js @@ -0,0 +1 @@ +// Dummy child script, used by browser_cacheFirstParty.js diff --git a/netwerk/test/browser/thirdPartyChild.track.vtt b/netwerk/test/browser/thirdPartyChild.track.vtt new file mode 100644 index 0000000..b37cb40 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.track.vtt @@ -0,0 +1,13 @@ +WEBVTT FILE + +1 +00:00:00.500 --> 00:00:02.000 D:vertical A:start +blah blah blah + +2 +00:00:02.500 --> 00:00:04.300 +this is a test + +3 +00:00:05.000 --> 00:00:07.000 +one more line diff --git a/netwerk/test/browser/thirdPartyChild.video.ogv b/netwerk/test/browser/thirdPartyChild.video.ogv new file mode 100644 index 0000000..68dee3c Binary files /dev/null and b/netwerk/test/browser/thirdPartyChild.video.ogv differ diff --git a/netwerk/test/browser/thirdPartyChild.xhr.html b/netwerk/test/browser/thirdPartyChild.xhr.html new file mode 100644 index 0000000..b750364 --- /dev/null +++ b/netwerk/test/browser/thirdPartyChild.xhr.html @@ -0,0 +1,8 @@ +<!DOCTYPE html> +<html> +<meta content="text/html;charset=utf-8" http-equiv="Content-Type"> + +<body> +<div>thirdPartyChild.html</div> +</body> +</html>

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit e223c84ed45e7bd935f1ab8f1aa6d655d4d458cc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 13 10:42:53 2015 -0800 fixup! TB4: Tor Browser's Firefox preference overrides. Remove the JIT prefs, as they are now handled by the security slider. --- browser/app/profile/000-tor-browser.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index a6bef64..fd0a35c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -156,13 +156,6 @@ pref("keyword.URL", "https://startpage.com/do/search?q="); pref("gfx.direct2d.disabled", true); pref("layers.acceleration.disabled", true); -// Security enhancements -// https://trac.torproject.org/projects/tor/ticket/9387#comment:17 -pref("javascript.options.ion.content", false); -pref("javascript.options.baselinejit.content", false); -pref("javascript.options.asmjs", false); -pref("javascript.options.typeinference", false); - // Audio_data is deprecated in future releases, but still present // in FF24. This is a dangerous combination (spotted by iSec) pref("media.audio_data.enabled", false);

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug #13749.1: regression tests for first party isolation of localStorage
by mikeperry＠torproject.org 14 Jan '15

14 Jan '15

commit a447c129b1f779ffdb76c401176e38a2d0c58192 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Dec 10 17:35:12 2014 -0800 Bug #13749.1: regression tests for first party isolation of localStorage --- dom/tests/mochitest/localstorage/firstParty.html | 16 +++++ .../mochitest/localstorage/firstPartyInner.html | 25 +++++++ dom/tests/mochitest/localstorage/mochitest.ini | 3 + .../test_localStorageByFirstParty.html | 73 ++++++++++++++++++++ 4 files changed, 117 insertions(+) diff --git a/dom/tests/mochitest/localstorage/firstParty.html b/dom/tests/mochitest/localstorage/firstParty.html new file mode 100644 index 0000000..7bf2539 --- /dev/null +++ b/dom/tests/mochitest/localstorage/firstParty.html @@ -0,0 +1,16 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> + <script> + window.onload = function () { + var inner = document.getElementById("inner"); + window.addEventListener("message", function (event) { + opener.postMessage(event.data, "http://mochi.test:8888"); + }); + inner.src = "http://example.net/tests/dom/tests/mochitest/localstorage/firstPartyInner.h…" + + location.search + "&host=" + encodeURIComponent(location.protocol + "//" + location.host); + }; + </script> + <body> + <div>firstParty.html</div> + <iframe id="inner" width=400 height=200></iframe> + </body> +</html> diff --git a/dom/tests/mochitest/localstorage/firstPartyInner.html b/dom/tests/mochitest/localstorage/firstPartyInner.html new file mode 100644 index 0000000..1b24d2b --- /dev/null +++ b/dom/tests/mochitest/localstorage/firstPartyInner.html @@ -0,0 +1,25 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <div>firstPartyInner.html</div> + <pre id="result"></pre> + <script> + var request = new URLSearchParams(location.search.substring(1)), + expected = request.get("expected"), + prescribed = request.get("prescribed"), + host = decodeURIComponent(request.get("host")), + found = localStorage.getItem("firstPartyTest"), + resultDiv = document.getElementById("result"), + show = function (x) { resultDiv.innerHTML += x + "\n"; }; + show("host: " + host); + if (expected) { + show("expected: " + expected); + show("found: " + found); + } + if (prescribed) { + localStorage.setItem("firstPartyTest", prescribed); + show("wrote: " + prescribed); + } + parent.postMessage(expected ? (found === expected) : true, host); + </script> + </body> +</html> diff --git a/dom/tests/mochitest/localstorage/mochitest.ini b/dom/tests/mochitest/localstorage/mochitest.ini index 3b3c50c..6d258f3 100644 --- a/dom/tests/mochitest/localstorage/mochitest.ini +++ b/dom/tests/mochitest/localstorage/mochitest.ini @@ -1,5 +1,7 @@ [DEFAULT] support-files = + firstParty.html + firstPartyInner.html frameAppIsolation.html frameChromeSlave.html frameKeySync.html @@ -32,6 +34,7 @@ skip-if = toolkit=='gonk' # b2g(4 failures) b2g-debug(debug-only failure) [test_localStorageBase.html] skip-if = buildapp == 'b2g' || e10s # b2g(no storage chrome event received) [test_localStorageBaseSessionOnly.html] +[test_localStorageByFirstParty.html] skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) [test_localStorageCookieSettings.html] skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) diff --git a/dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html b/dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html new file mode 100644 index 0000000..6858303 --- /dev/null +++ b/dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html @@ -0,0 +1,73 @@ +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title>localStorage by first party test</title> + +<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> +<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> + +<script type="application/javascript;version=1.7"> + +// This series of unit tests ensures that, when the "privacy.thirdparty.isolate" pref +// is set to 2 (active), we should have a separate localStorage for each first-party +// (URL bar domain). If the pref is set to 0 (inactive), then two iframes with the +// same origin but different first-party domains will share localStorage. + +let originalPrefValue = SpecialPowers.getIntPref("privacy.thirdparty.isolate"); + +let mapToUriParameters = aMap => + Object.keys(aMap).map(k => encodeURIComponent(k) + "=" + + encodeURIComponent(aMap[k])).join("&"); + +let steps = [ + // When first party isolation is turned off, we expect that DOM storage will be + // the same for two iframes at http://example.net. + { domain : "example.com", prescribed : "test1", pref : 0 }, + { domain : "example.org", prescribed : "test2" }, + { domain : "example.com", expected : "test2", prescribed : "test3" }, + { domain : "example.org", expected : "test3", prescribed : "test4" }, + // When first party isolation is turned on, we expect two separate DOM storage + // silos for two iframes both at http://example.net but contained in pages + // with different first party domains. + { domain : "example.com", prescribed : "test1", pref : 2 }, + { domain : "example.org", prescribed : "test2" }, + { domain : "example.com", expected : "test1", prescribed : "test3" }, + { domain : "example.org", expected : "test2", prescribed : "test4" } +]; + +let runStep = function (i) { + if (i < steps.length) { + let step = steps[i], + { domain, pref } = step; + if (pref !== undefined) { + SpecialPowers.setIntPref("privacy.thirdparty.isolate", pref); + } + window.open("http://" + domain + + "/tests/dom/tests/mochitest/localstorage/firstParty.html?" + + mapToUriParameters(step), "_blank"); + } else if (i == steps.length) { + SpecialPowers.setIntPref("privacy.thirdparty.isolate", originalPrefValue); + SimpleTest.finish(); + } +}; + +let startTest = function () { + let i = 0; + window.addEventListener("message", function (event) { + // Get the result of the last step. + is(event.data, true, "correct DOM storage isolation"); + // Run the next step. + runStep(++i); + }); + runStep(0); +}; + +SimpleTest.waitForExplicitFinish(); + +</script> + +</head> + +<body onload="startTest();"> + +</body> +</html>

1 0

[tor-browser-bundle/master] Prepare 4.5-alpha-3 release
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit 3946059dcf9c3125f9106c5f97a4f260776a3c6f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 10:55:53 2015 +0000 Prepare 4.5-alpha-3 release Update changelog; update config.yml; bump versions --- Bundle-Data/Docs/ChangeLog.txt | 31 +++++++++++++++++++++++++++++++ gitian/versions.alpha | 18 +++++++++--------- tools/update-responses/config.yml | 15 +++++---------- 3 files changed, 45 insertions(+), 19 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 11cf88b..7416e0c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,34 @@ +Tor Browser 4.5-alpha-3 -- Jan 16 2015 + * All Platforms + * Update Firefox to 31.4.0esr + * Update Tor to 0.2.6.2-alpha + * Update NoScript to 2.6.9.10 + * Update HTTPS Everywhere to 5.0development.2 + * Update meek to 0.15 + * Update Torbutton to 1.8.1.3 + * Bug 13998: Handle changes in NoScript 2.6.9.8+ + * Bug 14100: Option to hide NetworkSettings menuitem + * Bug 13079: Option to skip control port verification + * Bug 13835: Option to change default Tor Browser homepage + * Bug 11449: Fix new identity error if NoScript is not enabled + * Bug 13881: Localize strings for tor circuit display + * Bug 9387: Incorporate user feedback + * Bug 13671: Fixup for circuit display if bridges are used + * Translation updates + * Update Tor Launcher to 0.2.7.1 + * Translation updates + * Bug 13379: Sign our MAR files + * Bug 13788: Fix broken meek in 4.5-alpha series + * Bug 13439: No canvas prompt for content callers + +Tor Browser 4.0.3 -- Jan 13 2015 + * All Platforms + * Update Firefox to 31.4.0esr + * Update NoScript to 2.6.9.10 + * Update meek to 0.15 + * Update Tor Launcher to 0.2.7.0.2 + * Translation updates only + Tor Browser 4.5-alpha-2 -- Dec 5 2014 * All Platforms * Update Firefox to 31.3.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1dd1fdf..890b6a3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.3.0esr +FIREFOX_VERSION=31.4.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 -TOR_TAG=tor-0.2.6.1-alpha -TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.8.1.2 +TOR_TAG=tor-0.2.6.2-alpha +TORLAUNCHER_TAG=0.2.7.1 +TORBUTTON_TAG=1.8.1.3 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 @@ -36,7 +36,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -50,13 +50,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0development.1 +HTTPSE_VER=5.0development.2 GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.5-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -86,8 +86,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a -HTTPSE_HASH=d97ec822641d4ebf404fee1179497e1d80f2b8344d5fa485169ef045ba184db0 +NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 +HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 6b0018d..37c0ead 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,19 +6,14 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.2 - alpha: 4.5-alpha-2 + alpha: 4.5-alpha-3 versions: - 4.0.2: - platformVersion: 31.3.0 + 4.5-alpha-3: + platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.2 - 4.5-alpha-2: - platformVersion: 31.3.0 - detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-2 + download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-3 incremental_from: - - 4.5-alpha-1 + - 4.5-alpha-2 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/maint-4.0] We have 2015 meanwhile
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit 83854943dfa37dcece8d84e7225574b68c2e3000 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 11:08:23 2015 +0000 We have 2015 meanwhile --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 12f5180..953ae64 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 4.0.3 -- Jan 13 2014 +Tor Browser 4.0.3 -- Jan 13 2015 * All Platforms * Update Firefox to 31.4.0esr * Update NoScript to 2.6.9.10

1 0

[torbutton/master] Bump version to 1.8.1.3
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit 071e39ef291faf81417c78f51ad6f29bb60fe946 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 10:09:15 2015 +0000 Bump version to 1.8.1.3 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index ae524b2..e4045ad 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.1.2</em:version> + <em:version>1.8.1.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Update CHANGELOG; update translations
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit ac15b60896018504e2ea466a53438270ecc6a104 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 10:08:25 2015 +0000 Update CHANGELOG; update translations --- src/CHANGELOG | 11 +++++++++++ src/chrome/locale/ar/torbutton.dtd | 14 +++++++------- src/chrome/locale/ja/torbutton.dtd | 2 +- src/chrome/locale/ko/torbutton.dtd | 14 +++++++------- src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 14 +++++++------- src/chrome/locale/zh-CN/torbutton.properties | 2 +- 7 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a8b6b3a..a3e859e 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,14 @@ +1.8.1.3 + * Bug 13998: Handle changes in NoScript 2.6.9.8+ + * Bug 14100: Option to hide NetworkSettings menuitem + * Bug 13079: Option to skip control port verification + * Bug 13835: Option to change default Tor Browser homepage + * Bug 11449: Fix new identity error if NoScript is not enabled + * Bug 13881: Localize strings for tor circuit display + * Bug 9387: Incorporate user feedback + * Bug 13671: Fixup for circuit display if bridges are used + * Translation updates + 1.8.1.2 * Bug 13672: Make circuit display optional * Bug 13671: Make bridges visible on circuit display diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index e30348e..94ef3aa 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "زر تور"> <!ENTITY torbutton.button.tooltip "انقر لبدء زر تور"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "إعدادات الأمان والخصوصية"> <!ENTITY torbutton.prefs.block_thread "امنع قراءة تاريخ التصفح أثناء عمل تور (حَرِج)"> <!ENTITY torbutton.prefs.block_thwrite "امنع كتابة تاريخ التصفح أثناء عمل تور (محبّذ)"> <!ENTITY torbutton.prefs.block_nthread "امنع قراءة تاريخ التصفح أثناء توقف تور (اختياري)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "تقييد الـCookies الخاصة بالطرف الثالث و بيانات التتبع الأخري."> <!ENTITY torbutton.prefs.block_plugins "تعطيل إضافات المتصفح (مثل فلاش)"> <!ENTITY torbutton.prefs.resist_fingerprinting "تغيير التفاصيل التي تميزك عن المستخدمين الآخرين لمتصفح تور"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "مستوى الأمان"> +<!ENTITY torbutton.prefs.sec_low "منخفض (افتراضي)"> +<!ENTITY torbutton.prefs.sec_med_low "شبه منخفض"> +<!ENTITY torbutton.prefs.sec_med_high "شبه عالٍ"> +<!ENTITY torbutton.prefs.sec_high "عالٍ"> +<!ENTITY torbutton.prefs.sec_custom "قيم مخصصة"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 4add4d2..1f1d0a2 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -1,7 +1,7 @@ <!ENTITY torbutton.prefs.title "Torbutton設定"> <!ENTITY torbutton.prefs.tor_settings "プロクシ設定"> <!ENTITY torbutton.prefs.recommended_settings "Firefoxのプロクシ設定を使う"> -<!ENTITY torbutton.prefs.use_privoxy "プロクシを使う"> +<!ENTITY torbutton.prefs.use_privoxy "プロキシを使う"> <!ENTITY torbutton.prefs.use_polipo "Polipoを使う"> <!ENTITY torbutton.prefs.custom_settings "カスタム設定のプロキシを使う"> <!ENTITY torbutton.prefs.proxy.host.http "HTTPプロキシ"> diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 0b96309..26023f7 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Torbutton 설정 초기화"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "개인 정보와 보안 설정"> <!ENTITY torbutton.prefs.block_thread "Tor 사용 시, 사용 기록을 외부에서 읽어가는 것을 차단 (중요)"> <!ENTITY torbutton.prefs.block_thwrite "Tor 사용 시, 사용 기록을 남기지 않기 (추천)"> <!ENTITY torbutton.prefs.block_nthread "Tor를 사용하지 않을 때, 사용 기록을 외부에서 읽어가는 것을 차단 (선택)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "제 3자 쿠키와 다른 추적 데이터 제한"> <!ENTITY torbutton.prefs.block_plugins "브라우저 플러그인 비활성화 (예 : 플래시)"> <!ENTITY torbutton.prefs.resist_fingerprinting "다른 Tor browser 사용자로부터 구별되는 세부 사항 변경"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "보안 등급"> +<!ENTITY torbutton.prefs.sec_low "낮음 (기본)"> +<!ENTITY torbutton.prefs.sec_med_low "중간 낮음"> +<!ENTITY torbutton.prefs.sec_med_high "중간 높음"> +<!ENTITY torbutton.prefs.sec_high "높음"> +<!ENTITY torbutton.prefs.sec_custom "맞춤 값"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index d911237..606928a 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -1,6 +1,6 @@ <!ENTITY torbutton.prefs.title "Ayarlar"> <!ENTITY torbutton.prefs.tor_settings "Vekil Sunucu Ayarları"> -<!ENTITY torbutton.prefs.recommended_settings "Firefox'umda önerilen vekil sunucu ayarlarını kullan"> +<!ENTITY torbutton.prefs.recommended_settings "Firefox sürümüm için önerilen vekil sunucu ayarlarını kullan"> <!ENTITY torbutton.prefs.use_privoxy "Privoxy'i kullan"> <!ENTITY torbutton.prefs.use_polipo "Polipo'yu kullan"> <!ENTITY torbutton.prefs.custom_settings "Özel vekil sunucu ayarlarını kullan"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index f0f31b5..39b07dc 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "隐私与安全设置"> <!ENTITY torbutton.prefs.block_thread "使用 Tor 时禁止读取历史记录（重要）"> <!ENTITY torbutton.prefs.block_thwrite "使用 Tor 时禁止写入历史记录（推荐）"> <!ENTITY torbutton.prefs.block_nthread "使用 Tor 之外的代理时禁止读取历史记录（可选）"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.block_plugins "禁用浏览器插件（比如 Flash）"> <!ENTITY torbutton.prefs.resist_fingerprinting "请修改区别你与其他 Tor 浏览器用户的详细信息"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "安全等级"> +<!ENTITY torbutton.prefs.sec_low "低（默认）"> +<!ENTITY torbutton.prefs.sec_med_low "中低"> +<!ENTITY torbutton.prefs.sec_med_high "中高"> +<!ENTITY torbutton.prefs.sec_high "高"> +<!ENTITY torbutton.prefs.sec_custom "自定义"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 6425d8c..49bb702 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -29,7 +29,7 @@ torbutton.popup.launch = 下载文件 torbutton.popup.cancel = 取消 torbutton.popup.dontask = 自动下载文件于 torbutton.popup.test.no_http_proxy = Tor 代理测试：本地 HTTP 代理不可达，您的 Polipo 正常启动了吗？ -torbutton.popup.captcha.title = 避免 Google Captchas？ +torbutton.popup.captcha.title = 避免 Google Captcha？ torbutton.popup.captcha.ask = Torbutton 检测到了一个 Google Captcha，您是否愿意把本次搜索重定向到使用其他搜索引擎？ torbutton.popup.captcha.always = 此后总是使用此操作 torbutton.popup.redirect = 重定向

1 0

[tor-launcher/master] Bump version to 0.2.7.1
by gk＠torproject.org 14 Jan '15

14 Jan '15

commit beddbd16ac481746284eb90df1830c4ec3d1f63a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 14 09:04:52 2015 +0000 Bump version to 0.2.7.1 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index b78c677..7eac647 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.0.2</em:version> + <em:version>0.2.7.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[torbutton/master] Try to make the security slider less eager to switch to "custom".
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit 7975b2023d5dc9bc0437cb5d5fbfe539448900e4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jan 13 08:35:00 2015 -0800 Try to make the security slider less eager to switch to "custom". We actually need to rewrite the entire check for the custom settings here, but this quick hack will make it flap a bit less I think. --- src/chrome/content/torbutton.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8adef28..9cdb792 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -124,8 +124,6 @@ var torbutton_unique_pref_observer = this._branch.addObserver("gfx", this, false); this._branch.addObserver("noscript", this, false); this._branch.addObserver("media", this, false); - this._branch.addObserver("capability.policy.maonoscript.sites", this, - false); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Cc["@mozilla.org/observer-service;1"]. @@ -144,7 +142,6 @@ var torbutton_unique_pref_observer = this._branch.removeObserver("gfx", this); this._branch.removeObserver("noscript", this); this._branch.removeObserver("media", this); - this._branch.removeObserver("capability.policy.maonoscript.sites", this); var observerService = Cc["@mozilla.org/observer-service;1"]. getService(Ci.nsIObserverService); @@ -246,7 +243,9 @@ var torbutton_unique_pref_observer = case "media.opus.enabled": case "media.wave.enabled": case "media.apple.mp3.enabled": - case "capability.policy.maonoscript.sites": + // XXX: This logic is bad.. Instead, we need a check here + // that only sets custom if the prefs differ from the current + // security slider level (and also can set it back if they are the same). if (!m_tb_sliderUpdate) { // Do we already have custom settings? let customSlider = m_tb_prefs.

1 0

[torbutton/master] Add changelog for 1.7.0.2 for historical archive.
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit 5848794c74c3dfa2421c0a2f413a12168cf802b8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Nov 25 16:28:48 2014 -0800 Add changelog for 1.7.0.2 for historical archive. --- src/CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 5bc86c6..a8b6b3a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -26,6 +26,10 @@ * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs +1.7.0.2 + * Bug 13019: Synchronize locale spoofing pref with our Firefox patch + * Bug 13746: Properly link Torbutton UI to thirdparty pref. + 1.7.0.1 * Bug 13378: Prevent addon reordering in toolbars on first-run.

1 0

[torbutton/master] Bug 13998: Bind volatilePrivatePermissions to disk
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit eb343e2cdcbd35ae6140543f248969a7e3b9aa8d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 10:57:00 2015 +0000 Bug 13998: Bind volatilePrivatePermissions to disk We set `noscript.volatilePrivatePermissions` to `true` if disk records are disabled and otherwise to `false`. All this in the assumption NoScript is enabled at all. --- src/chrome/content/preferences.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 75937eb..f67906c 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -286,6 +286,20 @@ function torbutton_prefs_save(doc) { // Privacy and Security Settings o_torprefs.setBoolPref('block_disk', doc.getElementById('torbutton_blockDisk').checked); + // If we have NoScript enabled we set `noscript.volatilePrivatePermissions` + // to `true` if we are blocking disk records and to `false` if we are + // enabling them. + try { + if ("@maone.net/noscript-service;1" in Components.classes) { + let o_noscriptprefs = torbutton_get_prefbranch('noscript.'); + if (o_torprefs.getBoolPref('block_disk')) { + o_noscriptprefs.setBoolPref('volatilePrivatePermissions', true); + } else { + o_noscriptprefs.setBoolPref('volatilePrivatePermissions', false); + } + } + } catch (e) {} + o_torprefs.setBoolPref('resist_fingerprinting', doc.getElementById('torbutton_resistFingerprinting').checked); o_torprefs.setBoolPref('no_tor_plugins', doc.getElementById('torbutton_blockPlugins').checked); o_torprefs.setBoolPref('restrict_thirdparty', doc.getElementById('torbutton_restrictThirdParty').checked);

1 0

[torbutton/master] Bug 13998: Adapt code to fixed globalHttpsWhitelist
by mikeperry＠torproject.org 13 Jan '15

13 Jan '15

commit 915ec73bb2b556aa937a827fbe746b21dacec1f3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 12 13:03:34 2015 +0000 Bug 13998: Adapt code to fixed globalHttpsWhitelist --- src/chrome/content/torbutton.js | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4715fb6..8adef28 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2166,6 +2166,7 @@ var torbutton_sec_ml_bool_prefs = { var torbutton_sec_mh_bool_prefs = { "javascript.options.baselinejit.content" : false, + "noscript.global" : false, "noscript.globalHttpsWhitelist" : true, // XXX: pref for disableing SVG is missing }; @@ -2198,7 +2199,10 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. + // Removing "https:" is needed due to a bug in older Noscript versions. + // We leave that in for a while as there may be users that were affected + // by this bug. Removing it immediately and having the auto-updater might + // leave users exposed to the problem. if (capValue.indexOf(" https:") >= 0) { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); @@ -2224,7 +2228,10 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. + // Removing "https:" is needed due to a bug in older Noscript versions. + // We leave that in for a while as there may be users that were affected + // by this bug. Removing it immediately and having the auto-updater might + // leave users exposed to the problem. if (capValue.indexOf(" https:") >= 0) { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", "")); @@ -2244,17 +2251,14 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_ml_bool_prefs) { m_tb_prefs.setBoolPref(p, torbutton_sec_ml_bool_prefs[p]) } - for (p in torbutton_sec_mh_bool_prefs) { - m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) - } + // Order matters here as both the high mode and the medium-high mode + // share some preferences/values. So, let's revert the high mode + // preferences first and set the medium-high mode ones afterwards. for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, !torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. - // missing. - if (capValue.indexOf(" https:") < 0) { - m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue + - " https:"); + for (p in torbutton_sec_mh_bool_prefs) { + m_tb_prefs.setBoolPref(p, torbutton_sec_mh_bool_prefs[p]) } m_tb_prefs.setBoolPref("gfx.font_rendering.graphite.enabled", false); break; @@ -2276,7 +2280,10 @@ function torbutton_update_security_slider() { for (p in torbutton_sec_h_bool_prefs) { m_tb_prefs.setBoolPref(p, torbutton_sec_h_bool_prefs[p]) } - // XXX: Adding and removing "https:" is needed due to a bug in Noscript. + // Removing "https:" is needed due to a bug in older Noscript versions. + // We leave that in for a while as there may be users that were affected + // by this bug. Removing it immediately and having the auto-updater might + // leave users exposed to the problem. if (capValue.indexOf(" https:") >= 0) { m_tb_prefs.setCharPref("capability.policy.maonoscript.sites", capValue.replace(" https:", ""));

1 0

[tor-browser-bundle/master] Bug #13015: use git tags to set tor-browser version
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 28e1585aff3e8dd8d15ef7a7add7f95508e9a50b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 27 18:00:01 2014 +0100 Bug #13015: use git tags to set tor-browser version This commit adds a get-tb-version script which uses the git tags to output the Tor Browser version and its build directory. The output should be used with 'eval' in shell scripts to define the variables. It takes as argument the type of version (release, alpha or beta). If the current commit is tagged with tag tbb-4.2-build15, get-tb-version will output this: TORBROWSER_VERSION=4.2 TORBROWSER_BUILDDIR=4.2-build15 TORBROWSER_SYMLINK_VERSION=1 If the current commit is not tagged, get-tb-version will use the version from the last tagged commit in history. The build directory will include the commit hash rather than a build number. The output will be something like this: TORBROWSER_VERSION=4.0 TORBROWSER_BUILDDIR=4.0-1a98e3efb368 TORBROWSER_SYMLINK_VERSION=0 The TORBROWSER_BUILDDIR variable is used as the build directory. The TORBROWSER_SYMLINK_VERSION variable indicates whether we should create a symlink TORBROWSER_VERSION -> TORBROWSER_BUILDDIR. The various files which source the versions files and use TORBROWSER_VERSION have been updated to eval the output of get-tb-version too, and use TORBROWSER_BUILDDIR as build directory. --- gitian/check-match.sh | 25 +++++++++++---------- gitian/get-tb-version | 53 ++++++++++++++++++++++++++++++++++++++++++++ gitian/hash-bundles.sh | 3 ++- gitian/mkbundle-linux.sh | 18 ++++++++++----- gitian/mkbundle-mac.sh | 12 ++++++++-- gitian/mkbundle-windows.sh | 16 +++++++++---- gitian/upload-signature.sh | 17 +++++++------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 3 +++ 11 files changed, 118 insertions(+), 35 deletions(-) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index 0622512..71a57f2 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -24,6 +24,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) VALID="" VALID_incrementals="" @@ -33,11 +34,11 @@ do cd $WRAPPER_DIR # XXX: Is there a better way to store these and rename them? - mkdir -p $TORBROWSER_VERSION/$u - cd $TORBROWSER_VERSION/$u + mkdir -p $TORBROWSER_BUILDDIR/$u + cd $TORBROWSER_BUILDDIR/$u - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.txt || continue - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.txt.asc || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.txt || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.txt.asc || continue keyring="../../gpg/$u.gpg" @@ -53,18 +54,18 @@ done cd ../.. # XXX: We should refactor this code into a shared function -if [ -f $TORBROWSER_VERSION/sha256sums.incrementals.txt ] +if [ -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt ] then for u in $USERS do cd $WRAPPER_DIR # XXX: Is there a better way to store these and rename them? - mkdir -p $TORBROWSER_VERSION/$u - cd $TORBROWSER_VERSION/$u + mkdir -p $TORBROWSER_BUILDDIR/$u + cd $TORBROWSER_BUILDDIR/$u - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.incrementals.txt || continue - wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_VERSION/sha256sums.incrementals.txt.asc || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.incrementals.txt || continue + wget -U "" -N https://$HOST/~$u/builds/$TORBROWSER_BUILDDIR/sha256sums.incrementals.txt.asc || continue keyring="../../gpg/$u.gpg" @@ -83,18 +84,18 @@ cd ../.. exit_val=0 if [ -z "$VALID" ]; then - echo "No bundle hashes or sigs published for $TORBROWSER_VERSION." + echo "No bundle hashes or sigs published for $TORBROWSER_BUILDDIR." echo exit_val=1 else echo "Matching bundles exist from the following users: $VALID" fi -if [ -f $TORBROWSER_VERSION/sha256sums.incrementals.txt ] +if [ -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt ] then if [ -z "$VALID_incrementals" ] then - echo "No incremental mars hashes or sigs published for $TORBROWSER_VERSION." + echo "No incremental mars hashes or sigs published for $TORBROWSER_BUILDDIR." exit_val=1 else echo "Matching incremental mars exist from the following users: $VALID_incrementals" diff --git a/gitian/get-tb-version b/gitian/get-tb-version new file mode 100755 index 0000000..9a4a102 --- /dev/null +++ b/gitian/get-tb-version @@ -0,0 +1,53 @@ +#!/usr/bin/perl -w +use strict; + +sub run_cmd { + my @cmd = @_; + my $pid = open(my $fh, '-|'); + if (!$pid) { + exec(@cmd); + } + my @res = <$fh>; + waitpid($pid, 0); + die "Error running " . join(' ', @cmd) if $?; + chomp @res; + return @res; +} + +my %types = ( + release => qr/tbb-([^ab]+)-build(.+)$/, + beta => qr/tbb-(.+b.+)-build(.+)$/, + alpha => qr/tbb-(.+a.+)-build(.+)$/, +); +my $type = $ARGV[0] ? $ARGV[0] : 'release'; +exit 0 if $type eq 'nightly'; +die "Unknown type $type" unless $types{$type}; +my %tags; +foreach my $tag (run_cmd('git', 'tag')) { + if ($tag =~ m/$types{$type}/) { + my ($commit) = run_cmd('git', 'show', '-s', '--format=%H', + "$tag^{commit}"); + $tags{$commit} = [ $1, $2 ]; + } +} + +my ($current_commit) = run_cmd('git', 'show', '-s', '--format=%H'); +if ($tags{$current_commit}) { + print "TORBROWSER_VERSION=$tags{$current_commit}->[0]\n"; + print 'TORBROWSER_BUILDDIR=', $tags{$current_commit}->[0], '-build', + $tags{$current_commit}->[1], "\n"; + print "TORBROWSER_SYMLINK_VERSION=1\n"; + exit 0; +} + +foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { + next unless $tags{$commit}; + print "TORBROWSER_VERSION=$tags{$commit}->[0]\n"; + print "TORBROWSER_BUILDDIR=$tags{$commit}->[0]-", + substr($commit, 0, 12), "\n"; + print "TORBROWSER_SYMLINK_VERSION=0\n"; + exit 0; +} + +print STDERR "Could not find TORBROWSER version from tags\n"; +exit 1; diff --git a/gitian/hash-bundles.sh b/gitian/hash-bundles.sh index 2684158..37efdb1 100755 --- a/gitian/hash-bundles.sh +++ b/gitian/hash-bundles.sh @@ -14,10 +14,11 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) export LC_ALL=C -cd $TORBROWSER_VERSION +cd $TORBROWSER_BUILDDIR rm -f sha256sums.txt sha256sums.incrementals.txt sha256sum `ls -1 | grep -v '\.incremental\.mar$' | sort` > sha256sums.txt if ls -1 | grep -q '\.incremental\.mar$' diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 45f4f9b..4a773b8 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -16,6 +16,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder @@ -44,6 +45,7 @@ export PATH=$PATH:$PWD/libexec echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions +echo "TORBROWSER_VERSION=$TORBROWSER_VERSION" >> $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ @@ -252,11 +254,11 @@ then exit 1 fi - mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - #cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ + cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + #cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-linux.gbuilt else echo @@ -264,6 +266,12 @@ else echo fi +cd $WRAPPER_DIR +if [ "$TORBROWSER_SYMLINK_VERSION" == '1' ] +then + ln -sf $TORBROWSER_BUILDDIR $TORBROWSER_VERSION +fi + echo echo "****** Linux Bundle complete ******" echo diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 8a3aba6..ed54dc6 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -16,6 +16,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder @@ -44,6 +45,7 @@ export PATH=$PATH:$PWD/libexec echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions +echo "TORBROWSER_VERSION=$TORBROWSER_VERSION" >> $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ @@ -219,8 +221,8 @@ then exit 1 fi - mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ + cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 touch inputs/bundle-mac.gbuilt else echo @@ -228,6 +230,12 @@ else echo fi +cd $WRAPPER_DIR +if [ "$TORBROWSER_SYMLINK_VERSION" == '1' ] +then + ln -sf $TORBROWSER_BUILDDIR $TORBROWSER_VERSION +fi + echo echo "****** Mac Bundle complete ******" echo diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index e950884..945511b 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -16,6 +16,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder @@ -44,6 +45,7 @@ export PATH=$PATH:$PWD/libexec echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions +echo "TORBROWSER_VERSION=$TORBROWSER_VERSION" >> $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ @@ -222,10 +224,10 @@ then exit 1 fi - mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ - cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_VERSION/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 + mkdir -p $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ + cp -a build/out/*.exe $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_BUILDDIR/ || exit 1 + cp -a inputs/tor-win32-gbuilt.zip $WRAPPER_DIR/$TORBROWSER_BUILDDIR/tor-win32-${TOR_TAG_ORIG:4}.zip || exit 1 touch inputs/bundle-windows.gbuilt else echo @@ -233,6 +235,12 @@ else echo fi +cd $WRAPPER_DIR +if [ "$TORBROWSER_SYMLINK_VERSION" == '1' ] +then + ln -sf $TORBROWSER_BUILDDIR $TORBROWSER_VERSION +fi + echo echo "****** Windows Bundle complete ******" echo diff --git a/gitian/upload-signature.sh b/gitian/upload-signature.sh index 58059aa..c403cd5 100755 --- a/gitian/upload-signature.sh +++ b/gitian/upload-signature.sh @@ -21,21 +21,22 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) -if [ ! -f $TORBROWSER_VERSION/sha256sums.txt.asc ]; +if [ ! -f $TORBROWSER_BUILDDIR/sha256sums.txt.asc ]; then - pushd $TORBROWSER_VERSION && gpg -abs sha256sums.txt + pushd $TORBROWSER_BUILDDIR && gpg -abs sha256sums.txt popd fi -if [ -f $TORBROWSER_VERSION/sha256sums.incrementals.txt ] \ - && [ ! -f $TORBROWSER_VERSION/sha256sums.incrementals.txt.asc ] +if [ -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt ] \ + && [ ! -f $TORBROWSER_BUILDDIR/sha256sums.incrementals.txt.asc ] then - pushd $TORBROWSER_VERSION && gpg -abs sha256sums.incrementals.txt + pushd $TORBROWSER_BUILDDIR && gpg -abs sha256sums.incrementals.txt popd fi -ssh $HOST "mkdir -p $BASE_DIR/$TORBROWSER_VERSION" -scp $TORBROWSER_VERSION/sha256sums*.txt* $HOST:$BASE_DIR/$TORBROWSER_VERSION/ -ssh $HOST "chmod 755 $BASE_DIR/$TORBROWSER_VERSION && chmod 644 $BASE_DIR/$TORBROWSER_VERSION/*" +ssh $HOST "mkdir -p $BASE_DIR/$TORBROWSER_BUILDDIR" +scp $TORBROWSER_BUILDDIR/sha256sums*.txt* $HOST:$BASE_DIR/$TORBROWSER_BUILDDIR/ +ssh $HOST "chmod 755 $BASE_DIR/$TORBROWSER_BUILDDIR && chmod 644 $BASE_DIR/$TORBROWSER_BUILDDIR/*" diff --git a/gitian/versions b/gitian/versions index b6ec79f..36f315d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.0.1 +TORBROWSER_VERSION_TYPE=release BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b84f92e..5306d6b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.5-alpha-1 +TORBROWSER_VERSION_TYPE=alpha BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 diff --git a/gitian/versions.beta b/gitian/versions.beta index 29ba9e9..3678b37 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.1 +TORBROWSER_VERSION_TYPE=beta BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index e6ea2a1..d812187 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -1,4 +1,7 @@ +TORBROWSER_VERSION_TYPE=nightly TORBROWSER_VERSION=tbb-nightly +TORBROWSER_BUILDDIR=tbb-nightly +TORBROWSER_SYMLINK_VERSION=0 BUNDLE_LOCALES="ar ru zh-CN" BUILD_PT_BUNDLES=1

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/ticket_13015_v2'
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 0ca8d445690515e053e3dfbdaaf3b683b1021431 Merge: 5401e06 28e1585 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 15:09:56 2015 +0000 Merge remote-tracking branch 'boklm/ticket_13015_v2' gitian/check-match.sh | 25 +++++++++++---------- gitian/get-tb-version | 53 ++++++++++++++++++++++++++++++++++++++++++++ gitian/hash-bundles.sh | 3 ++- gitian/mkbundle-linux.sh | 18 ++++++++++----- gitian/mkbundle-mac.sh | 12 ++++++++-- gitian/mkbundle-windows.sh | 16 +++++++++---- gitian/upload-signature.sh | 17 +++++++------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 3 +++ 11 files changed, 118 insertions(+), 35 deletions(-)

1 0

[tor-launcher/master] Remove superfluous whitespace.
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 0717ad71785545ec167c531d60b5410a19ebbc1a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 10:03:50 2015 +0000 Remove superfluous whitespace. --- src/chrome/content/network-settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index f100f90..aa07e1e 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -123,7 +123,7 @@ function initDialog() // Hide the Tor Browser logo and associated separator element if the // TOR_HIDE_BROWSER_LOGO environment variable is set. let env = Cc["@mozilla.org/process/environment;1"] - .getService(Ci.nsIEnvironment); + .getService(Ci.nsIEnvironment); if (env.exists("TOR_HIDE_BROWSER_LOGO")) wizardElem.setAttribute("tor_hide_browser_logo", true);

1 0

[tor-launcher/master] Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set.
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit c1ee486489e33bb07164448b096afba5d899f661 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jan 12 17:39:45 2015 -0500 Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set. If the TOR_HIDE_BROWSER_LOGO environment variable is set, hide Tor Browser logo within the network settings wizard. Based on contributions from linostar and proper. --- src/chrome/content/network-settings-wizard.xul | 12 ++++++------ src/chrome/content/network-settings.js | 9 ++++++++- src/chrome/skin/network-settings.css | 7 ++++++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 04251f9..33ba6c5 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -35,7 +35,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator orient="vertical" /> + <separator class="tbb-logo-separator" orient="vertical" /> <groupbox flex="1"> <description>&torsettings.prompt;</description> </groupbox> @@ -60,7 +60,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <hbox> <vbox flex="1"> <label class="question">&torSettings.proxyQuestion;</label> @@ -79,7 +79,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <label class="instructions">&torSettings.enterProxy;</label> <groupbox id="proxySpecificSettings" /> </wizardpage> @@ -89,7 +89,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <hbox> <vbox flex="1"> <label class="question">&torSettings.bridgeQuestion;</label> @@ -109,7 +109,7 @@ <vbox class="tbb-logo-box" align="start"> <image class="tbb-logo" /> </vbox> - <separator /> + <separator class="tbb-logo-separator" /> <vbox> <label id="bridgeSettingsPrompt" class="question">&torSettings.bridgeSettingsPrompt;</label> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 908e711..f100f90 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -120,6 +120,13 @@ function initDialog() var haveWizard = (wizardElem != null); if (haveWizard) { + // Hide the Tor Browser logo and associated separator element if the + // TOR_HIDE_BROWSER_LOGO environment variable is set. + let env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + if (env.exists("TOR_HIDE_BROWSER_LOGO")) + wizardElem.setAttribute("tor_hide_browser_logo", true); + // Set "Copy Tor Log" label and move it after the Quit (cancel) button. var copyLogBtn = document.documentElement.getButton("extra2"); if (copyLogBtn) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index e4142d4..331ae42 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, The Tor Project, Inc. + * Copyright (c) 2015, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -94,6 +94,11 @@ button.firstAnswer { margin-right: 20px; } +wizard[tor_hide_browser_logo="true"] .tbb-logo, +wizard[tor_hide_browser_logo="true"] .tbb-logo-separator { + display: none; +} + #bridgeCustomEntry { margin-left: 30px; }

1 0

[torbutton/master] Bug 14100: Add option to hide NetworkSettings
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 765fee607af6fa88b99476dee10298e5db3b9eb1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 13 09:36:35 2015 +0000 Bug 14100: Add option to hide NetworkSettings This patch hides the NetworkSettings menuitem if the environment variable TOR_NO_DISPLAY_NETWORK_SETTINGS is set. Thanks to linostar for writing it. --- src/chrome/content/torbutton.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index bf06e04..4715fb6 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2386,6 +2386,16 @@ function torbutton_close_on_toggle(mode, newnym) { // New Identity where it is not supported (ie no control port). function torbutton_check_protections() { + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + + // Bug 14100: check for the existence of an environment variable + // in order to toggle the visibility of networksettings menuitem + if (env.exists("TOR_NO_DISPLAY_NETWORK_SETTINGS")) + document.getElementById("torbutton-networksettings").hidden = true; + else + document.getElementById("torbutton-networksettings").hidden = false; + var cookie_pref = m_tb_prefs.getBoolPref("extensions.torbutton.cookie_protections"); document.getElementById("torbutton-cookie-protector").disabled = !cookie_pref;

1 0

[torbutton/master] Bug #13078: environment variable to skip TorButton control port verification
by gk＠torproject.org 13 Jan '15

13 Jan '15

commit 38a59e819604de5018db5db54fb08fd9e1581d1f Author: Patrick Schleizer <adrelanos(a)riseup.net> Date: Sun Sep 7 20:49:41 2014 +0000 Bug #13078: environment variable to skip TorButton control port verification --- src/chrome/content/torbutton.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5aed682..bf06e04 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1875,8 +1875,12 @@ function torbutton_do_tor_check() // If we have a tor control port and transparent torification is off, // perform a check via the control port. + const kEnvSkipControlPortTest = "TOR_SKIP_CONTROLPORTTEST"; + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); if (m_tb_control_port && !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor") && + !env.exists(kEnvSkipControlPortTest) && m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { if (torbutton_local_tor_check()) checkSvc.statusOfTorCheck = checkSvc.kCheckSuccessful;

1 0

[tor-browser-bundle/maint-4.0] We are at 4.0.3 now
by gk＠torproject.org 11 Jan '15

11 Jan '15

commit 2a3a14746c15aed4350425ce96e2b7967cafee85 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 11 12:08:20 2015 +0000 We are at 4.0.3 now --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 911afdd..7cd1a03 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ channels: release: 4.0.3 alpha: 4.5-alpha-2 versions: - 4.0.2: + 4.0.3: platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en download_url: https://www.torproject.org/dist/torbrowser/4.0.3

1 0

[tor-browser-bundle/maint-4.0] Update the config.yml
by gk＠torproject.org 11 Jan '15

11 Jan '15

commit 1c40c56419150c42daf5b874b4dccd52507b8d85 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 11 12:04:58 2015 +0000 Update the config.yml --- tools/update-responses/config.yml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index bdecdec..911afdd 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,23 +6,21 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.2 - alpha: 4.5-alpha-1 + release: 4.0.3 + alpha: 4.5-alpha-2 versions: 4.0.2: - platformVersion: 31.3.0 + platformVersion: 31.4.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.2 + download_url: https://www.torproject.org/dist/torbrowser/4.0.3 incremental_from: - - 4.0 - - 4.0.1 - 4.5-alpha-1: - platformVersion: 31.2.0 + - 4.0.2 + 4.5-alpha-2: + platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-1 + download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-2 incremental_from: - - 4.0 - - 4.0.1 + - 4.5-alpha-1 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/maint-4.0] Preparing 4.0.3.
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 9c67ead33843115e7f4dcd2f7ce96c6008b19d0d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 22:35:17 2015 +0000 Preparing 4.0.3. Update Changelog; bump version of Tor Launcher, Firefox and NoScript. --- Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ gitian/versions | 14 +++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 50f7974..12f5180 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 4.0.3 -- Jan 13 2014 + * All Platforms + * Update Firefox to 31.4.0esr + * Update NoScript to 2.6.9.10 + * Update meek to 0.15 + * Update Tor Launcher to 0.2.7.0.2 + * Translation updates only + Tor Browser 4.0.2 -- Dec 2 2014 * All Platforms * Update Firefox to 31.3.0esr diff --git a/gitian/versions b/gitian/versions index a8c9475..ee4435c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,16 +1,16 @@ -TORBROWSER_VERSION=4.0.2 +TORBROWSER_VERSION=4.0.3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.3.0esr +FIREFOX_VERSION=31.4.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1 TOR_TAG=tor-0.2.5.10 -TORLAUNCHER_TAG=0.2.7.0.1 +TORLAUNCHER_TAG=0.2.7.0.2 TORBUTTON_TAG=1.7.0.2 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 @@ -33,7 +33,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.5-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a +NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 HTTPSE_HASH=c83f9bc10f3da6e33e2242c7944fd2bb534708821685bef7b9d16850550cc858 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-4.0] Separate MAR file/htdocs generation.
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit dca3ac0e09d1feda5d4f370960f824c0124f6492 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 21:44:36 2015 +0000 Separate MAR file/htdocs generation. This is part of d852329ac0979d8005e9e8bdd9b3f8a049fc2db4 which we need in order to be able to backport #13857 cleanly. The related part of the commit message is: Change update_responses to select the action to be done based on the program name, thereby separating the incremental MAR file generation (done via a new 'gen_incrementals' symlink) from the htdocs generation. Also added an 'update_responses' make target. Thanks to boklm for help with this. --- gitian/Makefile | 3 +++ tools/update-responses/gen_incrementals | 1 + tools/update-responses/update_responses | 34 ++++++++++++++++++++++++------- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 2c17656..b2e3224 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,6 +33,9 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: + ../tools/update-responses/gen_incrementals + +update_responses: ../tools/update-responses/update_responses hash: diff --git a/tools/update-responses/gen_incrementals b/tools/update-responses/gen_incrementals new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/gen_incrementals @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b28b575..5b85037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; @@ -13,6 +14,7 @@ use File::Which; use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +use File::Basename; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -158,7 +160,7 @@ sub create_incremental_mar { $pm->finish; } -sub create_missing_incremental_mars { +sub create_missing_incremental_mars_for_version { my ($config, $version) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); @@ -178,6 +180,14 @@ sub create_missing_incremental_mars { $pm->wait_all_children; } +sub create_all_missing_incremental_mars { + my ($config) = @_; + foreach my $version (values %{$config->{channels}}) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } +} + sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -224,7 +234,6 @@ sub write_responses { my ($config) = @_; foreach my $version (values %{$config->{channels}}) { get_version_files($config, $version); - create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; foreach my $old_os (keys %$migrate_archs) { @@ -309,8 +318,19 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } -extract_martools; -check_deps; -write_responses($config); -write_htaccess($config); -clean_htdocs; +my %actions = ( + update_responses => sub { + write_responses(@_); + write_htaccess(@_); + clean_htdocs; + }, + gen_incrementals => sub { + extract_martools; + check_deps; + create_all_missing_incremental_mars(@_); + }, +); + +my $action = fileparse($PROGRAM_NAME); +exit_error "Unknown action $action" unless $actions{$action}; +$actions{$action}->($config);

1 0

[tor-browser-bundle/maint-4.0] Bug 13857: allow making incrementals MARs for a specific channel
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit c39111b403e519aa56660c32c65fc9a64519ac17 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 14:43:12 2014 +0100 Bug 13857: allow making incrementals MARs for a specific channel The gen_incrementals can now receive a channel name as argument. In that case, incremental MARs will be created for this channel only. If there is no argument, incremental MARs for all channels are created. Makefile rules have been added for the different channels. --- gitian/Makefile | 8 +++++++- gitian/README.build | 7 +++++++ tools/update-responses/update_responses | 24 +++++++++++++++--------- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index b2e3224..5b646c8 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,7 +33,13 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: - ../tools/update-responses/gen_incrementals + ../tools/update-responses/gen_incrementals release + +incrementals-alpha: + ../tools/update-responses/gen_incrementals alpha + +incrementals-beta: + ../tools/update-responses/gen_incrementals beta update_responses: ../tools/update-responses/update_responses diff --git a/gitian/README.build b/gitian/README.build index 24a67a8..a5de8e2 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -71,6 +71,13 @@ Detailed Explanation of Scripts: - match-nightly: The equivalent to the 'match' rule for nightly packages - match-alpha: The equivalent to the 'match' rule for alpha packages - match-beta: The equivalent to the 'match' rule for beta packages + - hash-nightly: The equivalent to the 'hash' rule for nightly packages + - hash-alpha: The equivalent to the 'hash' rule for alpha packages + - hash-beta: The equivalent to the 'hash' rule for beta packages + - incrementals-alpha: The equivalent to the 'incrementals' rule for + alpha packages + - incrementals-beta: The equivalent to the 'incrementals' rule for + beta packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 5b85037..e66b27d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -180,14 +180,6 @@ sub create_missing_incremental_mars_for_version { $pm->wait_all_children; } -sub create_all_missing_incremental_mars { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { - get_version_files($config, $version); - create_missing_incremental_mars_for_version($config, $version); - } -} - sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -195,6 +187,16 @@ sub get_config { // $config->{$name}; } +sub channel_to_version { + my ($config, @channels) = @_; + return values %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + } + return map { $config->{channels}{$_} } @channels; +} + sub get_response { my ($config, $version, $os, @patches) = @_; my $res; @@ -325,9 +327,13 @@ my %actions = ( clean_htdocs; }, gen_incrementals => sub { + my ($config) = @_; extract_martools; check_deps; - create_all_missing_incremental_mars(@_); + foreach my $version (channel_to_version($config, @ARGV)) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } }, );

1 0

[tor-browser-bundle/maint-4.0] Add a command to check an update_responses deployement
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 8286124e36d9dd366b0e13b4a5a10ba80c3bd16c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 22 14:55:20 2014 +0100 Add a command to check an update_responses deployement usage: check_update_responses_deployement <base_url> [channels...] example: $ ./check_update_responses_deployement \ https://dist.torproject.org/torbrowser/update_2 release This command will read the config.yml file, then try to load different URLs to check that it returns correct xml with the expected version, incremental update files for the versions that should have them, or no update when already using the current version. It does not currently check that the checksum of the files is correct. --- tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/update_responses | 106 ++++++++++++++++++++ 3 files changed, 112 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 206bd7a..5fe69a2 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -13,7 +13,8 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp - IO::CaptureOutput File::Which Parallel::ForkManager + IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML + LWP On Debian / Ubuntu you can install them with: @@ -21,7 +22,8 @@ On Debian / Ubuntu you can install them with: # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ libdigest-sha-perl libxml-writer-perl \ libio-captureoutput-perl libfile-which-perl \ - libparallel-forkmanager-perl + libparallel-forkmanager-perl libxml-libxml-perl \ + libwww-perl ``` On Red Hat / Fedora you can install them with: @@ -29,7 +31,7 @@ On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager + Parallel::ForkManager XML::LibXML LWP do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/check_update_responses_deployement b/tools/update-responses/check_update_responses_deployement new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/check_update_responses_deployement @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 0c487e3..f982637 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use feature "state"; use English; use FindBin; use YAML qw(LoadFile); @@ -15,6 +16,8 @@ use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; use File::Basename; +use XML::LibXML '1.70'; +use LWP::Simple; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -26,6 +29,7 @@ my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; +my @check_errors; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -327,6 +331,107 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } +sub log_step { + my ($url, $step, $status, $details) = @_; + state $u; + if (!defined $u || $url ne $u) { + print "\n" if $u; + print "$url\n"; + $u = $url; + } + print ' ', $step, $status ? ': OK' : ': ERROR', + $details ? " - $details\n" : "\n"; + return if $status; + push @check_errors, { url => $url, step => $step, details => $details }; +} + +sub get_remote_xml { + my ($url) = @_; + my $content = get $url; + log_step($url, 'get', defined $content); + return undef unless defined $content; + my $dom = eval { XML::LibXML->load_xml(string => $content) }; + log_step($url, 'parse_xml', defined $dom, $@); + return $dom; +} + +sub check_get_version { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + return $updates[0]->getAttribute('appVersion'); +} + +sub check_no_update { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return @updates == 0; +} + +sub check_has_incremental { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + my @patches = $updates[0]->getChildrenByLocalName('patch'); + foreach my $patch (@patches) { + return 1 if $patch->getAttribute('type') eq 'partial'; + } + return undef; +} + +sub check_update_responses_channel { + my ($config, $base_url, $channel) = @_; + my $channel_version = $config->{channels}{$channel}; + foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $lang (qw(en-US de)) { + my $url = "$base_url/$channel/$build_target/1.0/$lang"; + my $dom = get_remote_xml($url); + if ($dom) { + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + } + $url = "$base_url/$channel/$build_target/$channel_version/$lang"; + $dom = get_remote_xml($url); + log_step($url, 'no_update', check_no_update($dom)) if $dom; + my @inc = @{$config->{versions}{$channel_version}{incremental_from}} + if $config->{versions}{$channel_version}{incremental_from}; + foreach my $inc_from (@inc) { + my $url = "$base_url/$channel/$build_target/$inc_from/$lang"; + $dom = get_remote_xml($url); + next unless $dom; + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + log_step($url, 'has_incremental', check_has_incremental($dom)); + } + } + } +} + +sub check_update_responses { + my ($config) = @_; + exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; + my ($base_url, @channels) = @ARGV; + foreach my $channel (@channels ? @channels : keys %{$config->{channels}}) { + check_update_responses_channel($config, $base_url, $channel); + } + if (!@check_errors) { + print "\n\nNo errors\n"; + return; + } + print "\n\nErrors list:\n"; + my $url = ''; + foreach my $error (@check_errors) { + if ($url ne $error->{url}) { + $url = $error->{url}; + print "$url\n"; + } + print " $error->{step}", + $error->{details} ? " - $error->{details}\n" : "\n"; + } +} + my %actions = ( update_responses => sub { my ($config) = @_; @@ -349,6 +454,7 @@ my %actions = ( create_missing_incremental_mars_for_version($config, $version); } }, + check_update_responses_deployement => \&check_update_responses, ); my $action = fileparse($PROGRAM_NAME);

1 0

[tor-browser-bundle/maint-4.0] Bug 13857: allow updating responses for a specific channel
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 06e8c9e859109da8bff3668e95cd3641bde48083 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 19:19:19 2014 +0100 Bug 13857: allow updating responses for a specific channel The update_responses command can now receive a channel name as argument. In that case, only the xml responses for the selected channel(s) are updated. The files are now located in directory htdocfiles/$channel and each channel has its own .htaccess file in that directory. Makefile rules have been added to update the different channels. --- gitian/Makefile | 8 +++- gitian/README.build | 4 ++ tools/update-responses/htdocs/no-update.xml | 2 - tools/update-responses/update_responses | 66 ++++++++++++++++----------- 4 files changed, 51 insertions(+), 29 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 5b646c8..33403b5 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -42,7 +42,13 @@ incrementals-beta: ../tools/update-responses/gen_incrementals beta update_responses: - ../tools/update-responses/update_responses + ../tools/update-responses/update_responses release + +update_responses-alpha: + ../tools/update-responses/update_responses alpha + +update_responses-beta: + ../tools/update-responses/update_responses beta hash: ./hash-bundles.sh versions diff --git a/gitian/README.build b/gitian/README.build index a5de8e2..b3e8be5 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -78,6 +78,10 @@ Detailed Explanation of Scripts: alpha packages - incrementals-beta: The equivalent to the 'incrementals' rule for beta packages + - update_responses-alpha: The equivalent to the 'update_responses' rule + for alpha packages + - update_responses-beta: The equivalent to the 'update_responses' rule + for beta packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. diff --git a/tools/update-responses/htdocs/no-update.xml b/tools/update-responses/htdocs/no-update.xml deleted file mode 100644 index 910e99d..0000000 --- a/tools/update-responses/htdocs/no-update.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates></updates> diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e66b27d..0c487e3 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -24,7 +24,7 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); -my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 ); +my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; sub exit_error { @@ -46,17 +46,21 @@ sub get_nbprocs { } sub write_htdocs { - my ($file, $content) = @_; + my ($channel, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; - write_file("$htdocsdir/$file", $content); - $htdocsfiles{$file} = 1; + mkdir "$htdocsdir/$channel" unless -d "$htdocsdir/$channel"; + write_file("$htdocsdir/$channel/$file", $content); + $htdocsfiles{$channel}->{$file} = 1; } sub clean_htdocs { - opendir(my $d, $htdocsdir); - my @files = grep { ! $htdocsfiles{$_} } readdir $d; - closedir $d; - unlink map { "$htdocsdir/$_" } @files; + my (@channels) = @_; + foreach my $channel (@channels) { + opendir(my $d, "$htdocsdir/$channel"); + my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$channel/$_" } @files; + } } sub get_sha512_hex_of_file { @@ -233,8 +237,10 @@ sub get_response { } sub write_responses { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + my $version = $config->{channels}{$channel}; get_version_files($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; @@ -249,43 +255,44 @@ sub write_responses { foreach my $lang (keys %{$files->{$os}}) { my $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}); - write_htdocs("$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$version-$os-$lang.xml", $resp); foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}, $files->{$os}{$lang}{partial}{$from_version}); - write_htdocs("$from_version-$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$from_version-$version-$os-$lang.xml", $resp); } } } + write_htdocs($channel, 'no-update.xml', + '<?xml version="1.0" encoding="UTF-8"?>' + . "\n<updates></updates>\n"); } } sub write_htaccess { - my ($config) = @_; - my $htaccess = "RewriteEngine On\n"; + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; my $flags = "[last]"; - foreach my $channel (sort keys %{$config->{channels}}) { + foreach my $channel (@channels) { + my $htaccess = "RewriteEngine On\n"; my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; - $htaccess .= "RewriteRule " - . "^$channel/[^\/]+/$version/ " - . "no-update.xml $flags\n"; + $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); foreach my $lang (sort keys %{$files->{$os}}) { foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " . "$from_version-$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt/[^\/]+/$lang " + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt " - . "$version-$os-en-US.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } + write_htdocs($channel, '.htaccess', $htaccess); } - write_htdocs('.htaccess', $htaccess); } sub check_deps { @@ -322,9 +329,16 @@ sub extract_martools { my %actions = ( update_responses => sub { - write_responses(@_); - write_htaccess(@_); - clean_htdocs; + my ($config) = @_; + my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; + } + write_responses($config, @channels); + write_htaccess($config, @channels); + clean_htdocs(@channels); }, gen_incrementals => sub { my ($config) = @_;

1 0

[tor-launcher/master] Update translations from Transifex.
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 08b65c7a8a35fe32204c0343c49286988a0f3e79 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 22:12:52 2015 +0000 Update translations from Transifex. --- src/chrome/locale/af/torlauncher.properties | 2 +- src/chrome/locale/am/torlauncher.properties | 2 +- src/chrome/locale/az/network-settings.dtd | 83 ++++++++--------- src/chrome/locale/az/progress.dtd | 8 +- src/chrome/locale/az/torlauncher.properties | 114 +++++++++++------------ src/chrome/locale/bg/network-settings.dtd | 2 +- src/chrome/locale/bg/torlauncher.properties | 8 +- src/chrome/locale/de/torlauncher.properties | 2 +- src/chrome/locale/el/network-settings.dtd | 6 +- src/chrome/locale/eo/network-settings.dtd | 8 +- src/chrome/locale/eo/progress.dtd | 6 +- src/chrome/locale/eo/torlauncher.properties | 44 ++++----- src/chrome/locale/es-AR/torlauncher.properties | 2 +- src/chrome/locale/es-CL/network-settings.dtd | 2 +- src/chrome/locale/es-CL/progress.dtd | 6 +- src/chrome/locale/es-CL/torlauncher.properties | 2 +- src/chrome/locale/eu/network-settings.dtd | 24 ++--- src/chrome/locale/fa/network-settings.dtd | 2 +- src/chrome/locale/fil/network-settings.dtd | 10 +- src/chrome/locale/fil/progress.dtd | 2 +- src/chrome/locale/fil/torlauncher.properties | 8 +- src/chrome/locale/fo/network-settings.dtd | 4 +- src/chrome/locale/fo/torlauncher.properties | 2 +- src/chrome/locale/fy/network-settings.dtd | 6 +- src/chrome/locale/fy/torlauncher.properties | 4 +- src/chrome/locale/he/network-settings.dtd | 14 +-- src/chrome/locale/he/progress.dtd | 2 +- src/chrome/locale/hy-AM/network-settings.dtd | 2 +- src/chrome/locale/id/network-settings.dtd | 6 +- src/chrome/locale/id/torlauncher.properties | 40 ++++---- src/chrome/locale/ja/network-settings.dtd | 2 +- src/chrome/locale/ko/network-settings.dtd | 8 +- src/chrome/locale/ko/torlauncher.properties | 2 +- src/chrome/locale/lo/torlauncher.properties | 4 +- src/chrome/locale/lt/network-settings.dtd | 6 +- src/chrome/locale/lt/torlauncher.properties | 64 ++++++------- src/chrome/locale/lv/network-settings.dtd | 10 +- src/chrome/locale/lv/torlauncher.properties | 2 +- src/chrome/locale/mr/torlauncher.properties | 2 +- src/chrome/locale/ms-MY/network-settings.dtd | 2 +- src/chrome/locale/nn/network-settings.dtd | 2 +- src/chrome/locale/nn/torlauncher.properties | 8 +- src/chrome/locale/pt-BR/network-settings.dtd | 4 +- src/chrome/locale/ro/network-settings.dtd | 8 +- src/chrome/locale/ru/torlauncher.properties | 8 +- src/chrome/locale/sl-SI/network-settings.dtd | 92 +++++++++---------- src/chrome/locale/sl-SI/progress.dtd | 8 +- src/chrome/locale/sl-SI/torlauncher.properties | 116 ++++++++++++------------ src/chrome/locale/sr/network-settings.dtd | 58 ++++++------ src/chrome/locale/sr/torlauncher.properties | 8 +- src/chrome/locale/sv/progress.dtd | 4 +- src/chrome/locale/sv/torlauncher.properties | 8 +- src/chrome/locale/tr/network-settings.dtd | 6 +- src/chrome/locale/tr/progress.dtd | 2 +- src/chrome/locale/tr/torlauncher.properties | 18 ++-- src/chrome/locale/zh-TW/torlauncher.properties | 2 +- 56 files changed, 439 insertions(+), 438 deletions(-) diff --git a/src/chrome/locale/af/torlauncher.properties b/src/chrome/locale/af/torlauncher.properties index 02be756..c347389 100644 --- a/src/chrome/locale/af/torlauncher.properties +++ b/src/chrome/locale/af/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(aanbeveel) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/am/torlauncher.properties b/src/chrome/locale/am/torlauncher.properties index 02be756..8329edd 100644 --- a/src/chrome/locale/am/torlauncher.properties +++ b/src/chrome/locale/am/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(የሚመከር) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd index 3cf2d1d..356db72 100644 --- a/src/chrome/locale/az/network-settings.dtd +++ b/src/chrome/locale/az/network-settings.dtd @@ -1,62 +1,63 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor şəbəkə paramertləri">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Tor şəbəkəsinə qoşulmaq üçün, kompüterin intrenet bağlantısı haqqında bəzi məlumatları verməlisiniz."> <!ENTITY torSettings.yes "Bəli"> <!ENTITY torSettings.no "Xeyr"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.firstQuestion "Aşağıdakılardan hansı sizin vəziyyətinizi tam təsvir edir?"> +<!ENTITY torSettings.configurePrompt1 "Bu kompüterin internet şəbəkəsi senzorlu vəya proksilidir."> +<!ENTITY torSettings.configurePrompt2 "Mən proksi və ya körpü quraşdırmalıyam."> +<!ENTITY torSettings.configure "Quraşdır"> +<!ENTITY torSettings.connectPrompt2 "Mən birbaşa Tor şəbəkəsinə qoşulmaq istəyirəm."> +<!ENTITY torSettings.connectPrompt3 "Bu əksər hallarda işləyir."> +<!ENTITY torSettings.connect "Qoşul"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Bu kompüterin İnernetə qoşulmaq üçün proksiyə ehtiyacı var?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.proxyHelp "Əgər siz bu suala nə cavab verəcəyinizə əmin deyilsinizsə, proksinin necə konfiqurasiya edildiyini öyrənmək üçün başqa bir brauzerin parametrlərinə nəzər salın "> +<!ENTITY torSettings.enterProxy "Proksy parametrlərini daxil edin"> +<!ENTITY torSettings.bridgeQuestion "Sizin internet provayderiniz(İSP) Tor şəbəkəsinə hər-hansı qadağa qoyub?"> +<!ENTITY torSettings.bridgeHelp "Əgər bu saula nə cavab verəcəyinizi bilirsinizsə Xeyr seçin.No.  +Əgər bəli seçsəniz, sizdən Tor körpüsü quraşdırmağınız tələb olunacaq,hansı ki bunlar qeydə alınmamış, qarşısının alınması daha çətin olan vasitələrdir."> +<!ENTITY torSettings.bridgeSettingsPrompt "Siz təmin olunmuş körpü dəstindən istifadə edə, və ya özünüz şəxsi körpü dəsti daxil edə bilərsiz.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.startingTor "Torun açılması üçün gözləyin..."> +<!ENTITY torsettings.restartTor "Tor`u yenidən başlat"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Əlavə"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.checkbox "Bu kompüte İnternetə qoşulmaq üçün proksi istifadə etməlidir"> +<!ENTITY torsettings.useProxy.type "Proxy Tipi:"> +<!ENTITY torsettings.useProxy.address "Ünvan:"> +<!ENTITY torsettings.useProxy.address.placeholder "İP ünvanı və ya anakompüterin adı"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "İstifadəçi adı:"> <!ENTITY torsettings.useProxy.password "Şifrə:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.firewall.checkbox "Bu kompüter yalnız müəyyən portlarla əlaqəyə icazə verən təhlükəsizlik divarindan keçir"> +<!ENTITY torsettings.firewall.allowedPorts "İczaə verilən portlar:"> +<!ENTITY torsettings.useBridges.checkbox "Mənim İnternet provayderim(İSP) Tor şəbəkəsinə qoşulmağı qadağan edir"> +<!ENTITY torsettings.useBridges.default "Təmin olunmuş köpüdən istifadə et"> +<!ENTITY torsettings.useBridges.type "Nəqliyyat tipi:"> +<!ENTITY torsettings.useBridges.custom "Körpü daxil edin"> +<!ENTITY torsettings.useBridges.label "Bir və ya daha çox Körpü qoşqusu daxil edin (hər sətirə ancaq bir dənə)"> <!ENTITY torsettings.useBridges.placeholder "type address:port"> -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.copyLog "Tor bort jurnalını panoya kopyalayın"> +<!ENTITY torsettings.bridgeHelpTitle "Körpü Keçid Dəstəyi"> +<!ENTITY torsettings.bridgeHelp1 "Əgər sən Tor şəbəkəsinə qoşula bilmirsənsə, ola bilsin ki, sənin İnternet Xidmət Provayderin (İXP) və ya digər agentlik Tor-la əlaqəni bloklayır.  Çox hallarda sən bu problemdən qaçınmaq üçün Tor Körpülərini istifadə edə bilərsən. Onların tapılıb bloklanması qat-qat çətin başa gəlir. "> +<!ENTITY torsettings.bridgeHelp1B "Aşağıdakı üç üsuldan birini istifadə etməklə əvvəlcədən konfiqurasiya edilmiş körpü ünvanları dəstini və ya istəyinə uyğun ünvan dəstini istifadə edə bilərsən:"> +<!ENTITY torsettings.bridgeHelp2Heading "Bilavasitə web ilə"> +<!ENTITY torsettings.bridgeHelp2 "web brauzer istifadə edərək bu səhifəni ziyarət edin https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Email Avtocavablayıcı Vasitəsilə"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Mətnində 'körpü əldə et' yazaraq bridges(a)torproject.org ünvanına email göndər.  Casus və ya hücumçunun körpü ünvanlarını aşkarlamasının qarşısını almaq üçün aşağıda sıralanmış email ünvanlardan (üstünlüyə uyğun sıralanmışdır) bu tələbi göndərməlisən:"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, və ya https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "Dəstək Masası Vasitəsilə"> +<!ENTITY torsettings.bridgeHelp4 "Son çarə olaraq körpü ünvanlarını help(a)rt.torproject.org ünvanına mədəni tələb emaili göndərməklə əldə edə bilərsən.  Lütfən, unutma ki, yazdığın insan hər bir tələbə ayrı ayrı cavab yazacaq."> diff --git a/src/chrome/locale/az/progress.dtd b/src/chrome/locale/az/progress.dtd index ebd9cef..473b050 100644 --- a/src/chrome/locale/az/progress.dtd +++ b/src/chrome/locale/az/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.dialog.title "Tor Statusu"> +<!ENTITY torprogress.openSettings "Parametrləri aç"> +<!ENTITY torprogress.heading "Tor şəbəkəsinə qoşulur"> +<!ENTITY torprogress.pleaseWait "Zəhmət olmasa biz Tor şəbəkəsini quraşdiranadək gözləyin."> diff --git a/src/chrome/locale/az/torlauncher.properties b/src/chrome/locale/az/torlauncher.properties index a70b15b..55df92f 100644 --- a/src/chrome/locale/az/torlauncher.properties +++ b/src/chrome/locale/az/torlauncher.properties @@ -1,61 +1,61 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). - -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. - -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.recommended_bridge=(recommended) - -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.error_title=Tor İşlədici + +torlauncher.tor_exited=Tor gözlənilmədən dayandı. Bu Tor-un özündəki problemlə, sistemindəki başqa proqramla və ya avadanlıqdakı xətayla bağlı ola bilər. Tor-u yenidən başlatmadığın vaxt ərzində Tor Browser heç bir sayta daxil ola bilməyəcək. Bu problem olduğu kimi qalarsa, öz Tor Girişinin üzünü dəstək komandasına göndər. +torlauncher.tor_exited2=Tor-un yenidən başladılması sənin brauzerlərinə təsir etməyəcək. +torlauncher.tor_controlconn_failed=Tor yoxlama portu ilə bağlantı yarada bilmədi. +torlauncher.tor_failed_to_start=Tor başlaya bilmədi. +torlauncher.tor_control_failed=Tor-a nəzarət alınmadı. +torlauncher.tor_bootstrap_failed=Tor şəbəkə əlaqəsini Tor quraşdıra bilmədi. +torlauncher.tor_bootstrap_failed_details=%1$S xətası (%2$S). + +torlauncher.unable_to_start_tor=Tor başlaya bilmir.\n\n%S +torlauncher.tor_missing=İcra edilə bilən Tor çatışmır. +torlauncher.torrc_missing=Torrc faylı çatışmır. +torlauncher.datadir_missing=Tor məlumat kataloqu mövcud deyil. +torlauncher.password_hash_missing=Qarışıd şifrə əldə edə bilmədi. + +torlauncher.failed_to_get_settings=Tor parametrlərinin bərpası mümkün olmadı.\n\n%S +torlauncher.failed_to_save_settings=Tor parametrlərini saxlamaq mümkün olmadı.\n\n%S +torlauncher.ensure_tor_is_running=Tor-un işlədiyindən əmin ol. + +torlauncher.error_proxy_addr_missing=Tor internetə daxil olmaq üçün proksi istifadə etsin deyə sən hər ikisini - IP ünvan və ya host adını və port nömrəsini qeyd etməlisən. +torlauncher.error_proxy_type_missing=Sən proksi növünü seçməlisən. +torlauncher.error_bridges_missing=Sən bir və ya daha çox körpü seçməlisən. +torlauncher.error_default_bridges_type_missing=Təqdim edilmiş körpülər üçün nəqliyyat növünü seçməlisən. +torlauncher.error_bridge_bad_default_type=%S növ nəqliyyata sahib olan təqdim edilmiş körpü yoxdur. Lütfən, parametrlərini quraşdır. + +torlauncher.recommended_bridge=(məsləhət edilən) + +torlauncher.connect=Qoşul +torlauncher.restart_tor=Tor`u yenidən başlat +torlauncher.quit=Bitir torlauncher.quit_win=Çıx -torlauncher.done=Done - -torlauncher.forAssistance=For assistance, contact %S - -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. - -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.done=Oldu + +torlauncher.forAssistance=Dəstək üçün %S ilə əlaqə saxla + +torlauncher.copiedNLogMessages=Köçürülmə tamamlandı. %S Tor giriş mesajları mətn dəyişdiricisi və ya email mesajına daxil edilməyə hazırdır. + +torlauncher.bootstrapStatus.conn_dir=Keçid kataloqu ilə əlaqə +torlauncher.bootstrapStatus.handshake_dir=Şifrələnmiş kataloq əlaqəsinin yaradılması +torlauncher.bootstrapStatus.requesting_status=Şəbəkə statusunun bərpası +torlauncher.bootstrapStatus.loading_status=Şəbəkə statusunun yüklənməsi +torlauncher.bootstrapStatus.loading_keys=Səlahiyyət sertifikatlarının yüklənməsi +torlauncher.bootstrapStatus.requesting_descriptors=Keçid məlumatının tələb edilməsi +torlauncher.bootstrapStatus.loading_descriptors=Keçid məlumatının yüklənməsi +torlauncher.bootstrapStatus.conn_or=Tor şəbəkəsinə qoşulur +torlauncher.bootstrapStatus.handshake_or=Tor dövrəsinin yaradılması +torlauncher.bootstrapStatus.done=Tor şəbəkəsi ilə əlaqə! + +torlauncher.bootstrapWarning.done=oldu +torlauncher.bootstrapWarning.connectrefused=əlaqə rədd edildi +torlauncher.bootstrapWarning.misc=qarışıq +torlauncher.bootstrapWarning.resourcelimit=qeyri-kafi mənbə +torlauncher.bootstrapWarning.identity=müəyyənəşdirmə uyğunsuzluğu +torlauncher.bootstrapWarning.timeout=əlaqə vaxtının bitməsi +torlauncher.bootstrapWarning.noroute=host üçün istiqamət yoxdur +torlauncher.bootstrapWarning.ioerror=oxuma/yazma xətası +torlauncher.bootstrapWarning.pt_missing=çatışmayan pluggable transport diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 27ae588..ebd1fbc 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Изчакване на Tor да стартира..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Рестартирайте Тор"> <!ENTITY torsettings.optional "Допълнителен"> diff --git a/src/chrome/locale/bg/torlauncher.properties b/src/chrome/locale/bg/torlauncher.properties index 2363674..af17760 100644 --- a/src/chrome/locale/bg/torlauncher.properties +++ b/src/chrome/locale/bg/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Тор лънчер -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=Тор се изключи неочаквано.Това може да е поради бъг в самият Тор,друга програма в системата ви или повреден хардуер.Докато не рестартирате Тор браузърът няма да може да отваря никакви сайтове.Ако проблемът продължава моля изпратете вашият Тор Log към нашия екип по поддръжката. +torlauncher.tor_exited2=Рестартирането на Тор няма да затвори вашите прозорци в браузъра. torlauncher.tor_controlconn_failed=Тор няма връзка с контролния порт torlauncher.tor_failed_to_start=Тор не стартира успешно torlauncher.tor_control_failed=Неуспя да поеме контрол над Тор. @@ -30,14 +30,14 @@ torlauncher.error_bridge_bad_default_type=Никой от избраните м torlauncher.recommended_bridge=(препоръчително) torlauncher.connect=Свържи се -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Рестартирайте Тор torlauncher.quit=Край torlauncher.quit_win=Изход torlauncher.done=Готово torlauncher.forAssistance=За съдействие , моля свържете се с %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Копирането е завършено. %S Съобщенията от Тор log-а са готови да бъдат поставени в текстов редактор или имейл. torlauncher.bootstrapStatus.conn_dir=Свързване с препредаващата директория torlauncher.bootstrapStatus.handshake_dir=Осъществяване на връзка с криптираната директория diff --git a/src/chrome/locale/de/torlauncher.properties b/src/chrome/locale/de/torlauncher.properties index 5dc89c9..5a24e5d 100644 --- a/src/chrome/locale/de/torlauncher.properties +++ b/src/chrome/locale/de/torlauncher.properties @@ -58,4 +58,4 @@ torlauncher.bootstrapWarning.identity=Nichtübereinstimmung der Identitäten torlauncher.bootstrapWarning.timeout=Verbindungszeitüberschreitung torlauncher.bootstrapWarning.noroute=Kein Pfad zum Rechner torlauncher.bootstrapWarning.ioerror=Lese-/Schreibfehler -torlauncher.bootstrapWarning.pt_missing=Pluggable Transport fehlt +torlauncher.bootstrapWarning.pt_missing=Steckbarer Transport fehlt diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index b375a22..5393cb2 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "TorΡυθμίσεις Δικτύου "> +<!ENTITY torsettings.dialog.title "Tor Ρυθμίσεις Δικτύου ">  @@ -9,7 +9,7 @@ <!ENTITY torSettings.firstQuestion "Ποιο από τα παρακάτω περιγράφει καλύτερα την κατάστασή σας;"> <!ENTITY torSettings.configurePrompt1 "Σύνδεση στο Internet αυτού του υπολογιστή λογοκρίνεται ή προσεγγίζεται"> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Χρειάζονται ρυθμίσεις για τις γέφυρες, για το firewall, ή για τον proxy μου."> <!ENTITY torSettings.configure "Ρύθμιση "> <!ENTITY torSettings.connectPrompt2 "Θα ήθελα να συνδεθεί άμεσα με το δίκτυο Tor."> <!ENTITY torSettings.connectPrompt3 "Αυτό θα λειτουργήσει στις περισσότερες περιπτώσεις."> @@ -57,7 +57,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Μέσω του Διαδικτύου"> <!ENTITY torsettings.bridgeHelp2 "Χρησιμοποιήστε έναν φυλλομετρητή για να επισκεφτείτε το https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Μέσω της Αυτοματοποιημένης Απάντησης Email"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Αποστολή email στο bridges(a)torproject.org με τη γραμμή «λήψη γεφυρών» από μόνη της στο σώμα του μηνύματος.  Ωστόσο, για να γίνει πιο δύσκολο για έναν εισβολέα να μάθει πολλά από τις διευθύνσεις γεφυρών, θα πρέπει να στείλετε αυτό το αίτημα από ένα από τους επόμενους πάροχους υπηρεσιών ηλεκτρονικού ταχυδρομείου (αναφέρονται κατά σειρά προτίμησης):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Μέσω της Υποστήριξης"> <!ENTITY torsettings.bridgeHelp4 "Αν όλα τα άλλα αποτύχουν, μπορείτε να ζητήσετε διευθύνσεις γεφυρών στέλνοντας ένα ευγενικό email στο help(a)rt.torproject.org.  Σημείωση: Κάποιος εθελοντής θα πρέπει να απαντήσει χειροκίνητα (συνεπώς η απάντηση ίσως αργήσει)."> diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd index 4f96a94..de02431 100644 --- a/src/chrome/locale/eo/network-settings.dtd +++ b/src/chrome/locale/eo/network-settings.dtd @@ -4,7 +4,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> +<!ENTITY torSettings.yes "Jes"> <!ENTITY torSettings.no "Ne"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> @@ -13,7 +13,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "Konekti"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Restartigi Tor"> <!ENTITY torsettings.optional "Optional"> @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Pordo:"> <!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Pasvorto:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/src/chrome/locale/eo/progress.dtd b/src/chrome/locale/eo/progress.dtd index 813ba94..9fc2f3b 100644 --- a/src/chrome/locale/eo/progress.dtd +++ b/src/chrome/locale/eo/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> +<!ENTITY torprogress.dialog.title "Stato de Tor"> +<!ENTITY torprogress.openSettings "Malfermi agordojn"> <!ENTITY torprogress.heading "Konektante al Tor-reto"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Bonvolu atendi ĝis kiam ni ne starigos konekton al la Tor-reto."> diff --git a/src/chrome/locale/eo/torlauncher.properties b/src/chrome/locale/eo/torlauncher.properties index 8a3706c..7609a5c 100644 --- a/src/chrome/locale/eo/torlauncher.properties +++ b/src/chrome/locale/eo/torlauncher.properties @@ -1,43 +1,43 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor-startigilo torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. +torlauncher.tor_controlconn_failed=Ne eblas konektiĝi al kontrolpordo de Tor. +torlauncher.tor_failed_to_start=Starto de Tor malsukcesis. torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed=Tor malsukcesis starigi Tor-retkonekton. +torlauncher.tor_bootstrap_failed_details=%1$S malsukcesis (%2$S). -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.unable_to_start_tor=Ne eblas starti Tor.\n\n%S +torlauncher.tor_missing=Tor-komandodosiero mankas. +torlauncher.torrc_missing=Konfigura dosiero torrc mankas. +torlauncher.datadir_missing=Datuma dosierujo de Tor ne ekzistas. +torlauncher.password_hash_missing=Malsukcesis ricevado de haketigita pasvorto. -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Ne eblas ricevi agordojn de Tor.\n\n%S +torlauncher.failed_to_save_settings=Ne eblas konservi agordojn de Tor.\n\n%S +torlauncher.ensure_tor_is_running=Bonvolu certiĝi ĉu Tor estas startigita. torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. +torlauncher.error_proxy_type_missing=Vi devas elekti tipon de prokurservilo. +torlauncher.error_bridges_missing=Vi devas specifi unu aŭ pli da pontojn. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(rekomendita) -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit +torlauncher.connect=Konekti +torlauncher.restart_tor=Restartigi Tor +torlauncher.quit=Eliri torlauncher.quit_win=Eliri -torlauncher.done=Done +torlauncher.done=Preta -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Por asiston kontaktu %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopiado estas preta. %S Tor-protokolaj mesaĝoj pretas por enigi ilin en tekstredaktilon aŭ retpoŝtmesaĝon. torlauncher.bootstrapStatus.conn_dir=Konektante al relajsa dosierujo torlauncher.bootstrapStatus.handshake_dir=Starigante ĉifritan dosierujan konekton diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 6b9b4af..3c010cb 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Hecho torlauncher.forAssistance=Para solicitar asistencia, contactese al %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Copia completa. %S registros de log de Tor están listos para ser pegados en un editor de textos o un e-mail. torlauncher.bootstrapStatus.conn_dir=Conectando para retransmitir directorio torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión segura al directorio diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd index 3661088..b1daa5b 100644 --- a/src/chrome/locale/es-CL/network-settings.dtd +++ b/src/chrome/locale/es-CL/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Configuracion De Internet Tor">  diff --git a/src/chrome/locale/es-CL/progress.dtd b/src/chrome/locale/es-CL/progress.dtd index ebd9cef..73f1bbf 100644 --- a/src/chrome/locale/es-CL/progress.dtd +++ b/src/chrome/locale/es-CL/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.dialog.title "Estado Del Modulo Tor"> <!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.heading "Conectando a la red Tor"> +<!ENTITY torprogress.pleaseWait "Por favor espere mientras establecemos una conexión a la red Tor."> diff --git a/src/chrome/locale/es-CL/torlauncher.properties b/src/chrome/locale/es-CL/torlauncher.properties index 02be756..292e182 100644 --- a/src/chrome/locale/es-CL/torlauncher.properties +++ b/src/chrome/locale/es-CL/torlauncher.properties @@ -46,7 +46,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index 3e90c07..aab8b06 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -2,14 +2,14 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Tor sarera konektatu baino lehen, ordenagailu honen Interneteko konexioari buruzko informazioa eman behar duzu."> <!ENTITY torSettings.yes "Bai"> <!ENTITY torSettings.no "Ez"> <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta dago edo proxy batetik igarotzen da."> +<!ENTITY torSettings.configurePrompt2 "Zubi edo proxy ezarpenak konfiguratu behar ditut."> <!ENTITY torSettings.configure "Konfiguratu"> <!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke."> <!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du."> @@ -19,9 +19,9 @@  <!ENTITY torSettings.proxyHelp "Galdera hau nola erantzuteaz zalantzan bazaude, begiratu beste nabigatzaile batean Interneteko ezarpenak proxy bat erabiltzeko konfiguratuta dagoen ikusteko."> <!ENTITY torSettings.enterProxy "Sartu proxy ezarpenak."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Zure Interneteko Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera doazen konexioak blokeatu edo zentsuratu egiten ditu?"> +<!ENTITY torSettings.bridgeHelp "Galdera hau nola erantzuteaz ziur ez bazaude, aukeratu Ez.  Bai aukeratzen baduzu, Tor zubiak konfigura ditzazun eskatuko zaizu, hau da zerrendatuta ez dauden eta Tor sarera doazen konexioak blokeatzea zailago egiten duten erreleak."> +<!ENTITY torSettings.bridgeSettingsPrompt "Emandako zubi taldea erabili dezakezu edo zubi talde pertsonalizatua eskuratu eta sar dezakezu.">  @@ -43,20 +43,20 @@ <!ENTITY torsettings.firewall.checkbox "Ordenagailu honek ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar doa"> <!ENTITY torsettings.firewall.allowedPorts "Baimendutako atakak:"> <!ENTITY torsettings.useBridges.checkbox "Nire Internet Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera konektatzea blokeatzen dit."> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "Emandako zubiekin konektatu"> +<!ENTITY torsettings.useBridges.type "Garraio mota:"> +<!ENTITY torsettings.useBridges.custom "Sartu zubi pertsonalizatuak"> <!ENTITY torsettings.useBridges.label "Sartu zubi errele bat edo gehiago (bat lerro bakoitzeko)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "helbidea:ataka"> <!ENTITY torsettings.copyLog "Kopiatu Tor erregistroa arbelera"> <!ENTITY torsettings.bridgeHelpTitle "Zubi errele laguntza"> <!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.  Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "Aurrez konfiguratutako, emandako zubi taldea erabili dezakezu, edo zubi talde pertsonalizatua eskuratu dezakezu hurrengo hiru metodoetako bat aukeratuz: "> <!ENTITY torsettings.bridgeHelp2Heading "Webean bidez"> <!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko"> <!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Bidali ezazu mezu bat bridges(a)torproject.org-era mezuaren gorputzean 'get bridges' esaldiarekin.  Hala ere, erasotzaile batentzat zubi helbide asko ikastea zailago izan dadin, eskakizun hau hurrengo domeinuetako eposta helbide batetik bidali behar duzu (lehentasunaren arabera zerrendatuta):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Laguntza mahaiaren bidez"> <!ENTITY torsettings.bridgeHelp4 "Azken aukera bezala, zubi erreleak eska ditzakezu mezu adeitsu bat help(a)rt.torproject.org-era bidaliz.  Mesedez, kontuan izan pertsona batek eskarea bakoitza erantzun beharko duela."> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 3b755f8..f42720d 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -57,7 +57,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "از طریق اینترنت"> <!ENTITY torsettings.bridgeHelp2 "با استفاده از یک مرورگر به آدرس https://bridges.torproject.org بروید."> <!ENTITY torsettings.bridgeHelp3Heading "از طریق آدرس ایمیل پاسخگوی خودکار"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "یک ایمیل حاوی عبارت 'get bridges' به آدرس bridges(a)torproject.org ارسال کنید.  هر چند ، برای اینکه بتوانیم یادگیری آدرس بسیاری از پل‌ها را برای مهاجم سخت‌تر کنیم ، می‌بایست این درخواست را از یکی از سرویس دهنده‌های ایمیل زیر بفرستید ( ذکر شده به ترتیب اولویت ) :"> <!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 ارسال کنید.  در نظر داشته باشید که یک نفر باید ایمیل شما را بخواند و به آن پاسخ دهد. پس صبور باشید."> diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index 41348a6..ca5fe24 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -2,20 +2,20 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Bago ka maka-connect sa Tor network, kailangan mong mag-bigay ng impormasyon tungkol sa koneksyon sa Internet ng kompyuter na ito. "> <!ENTITY torSettings.yes "Oo"> <!ENTITY torSettings.no "Wala"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Alin dito ang pinaka angkop na nagsasaad ng iyong sitwasyon?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Kailangan kong i-configure ang bridge o proxy settings"> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Makipag-ugnay"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Kailangan ba ng kompyuter na ito na gumamit ng proxy upang makagamit ng Internet?">  <!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> <!ENTITY torSettings.enterProxy "Enter the proxy settings."> @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "I-restart ang Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/fil/progress.dtd b/src/chrome/locale/fil/progress.dtd index 372f1af..df60b42 100644 --- a/src/chrome/locale/fil/progress.dtd +++ b/src/chrome/locale/fil/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> +<!ENTITY torprogress.openSettings "Buksan ang Settings"> <!ENTITY torprogress.heading "Kumukonekta sa network ng Tor"> <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/fil/torlauncher.properties b/src/chrome/locale/fil/torlauncher.properties index a801b32..23dfc4d 100644 --- a/src/chrome/locale/fil/torlauncher.properties +++ b/src/chrome/locale/fil/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tagapaglunsad ng Tor -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=Ang Tor ay nagsara ng hindi sinasadya. Ito ay marahil sa isang bug sa Tor, ibang programa sa iyong sistema, o depektibong hardware. Hanggang ma-restart mo ang Tor, ang Tor Browser ay hindi makakapagabot sa kahit anong mga website. Kung ang problema ay nagpapatuloy, mag-sumite ng isang kopya ng iyong Tor Log sa support team. +torlauncher.tor_exited2=Ang pag-restart sa Tor ay hindi magsasara ng mga tab sa browser. torlauncher.tor_controlconn_failed=Hindi makakonekta sa Tor control port. torlauncher.tor_failed_to_start=Nabigong magsimula ang Tor. torlauncher.tor_control_failed=Nabigong kontrolin ang Tor. @@ -30,14 +30,14 @@ torlauncher.error_bridge_bad_default_type=Walang maaaring gamitin sa mga ibiniga torlauncher.recommended_bridge=(rekomendado) torlauncher.connect=Kumonekta -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=I-restart ang Tor torlauncher.quit=Tumigil torlauncher.quit_win=Lumabas torlauncher.done=Tapos na torlauncher.forAssistance=Para sa tulong, makipag-ugnay sa %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kumpleto na ang Pag-kopya. %S Ang mga log messages ng Tor ay handa na ma-paste sa isang text editor o sa e-mail message. torlauncher.bootstrapStatus.conn_dir=Kumokonekta sa isang direktoryo ng relay torlauncher.bootstrapStatus.handshake_dir= Itinatatag ang isang naka-encrypt na direktoryo ng koneksyon diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd index 3661088..c2db870 100644 --- a/src/chrome/locale/fo/network-settings.dtd +++ b/src/chrome/locale/fo/network-settings.dtd @@ -4,8 +4,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Ja"> +<!ENTITY torSettings.no "Nei"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> diff --git a/src/chrome/locale/fo/torlauncher.properties b/src/chrome/locale/fo/torlauncher.properties index 02be756..954ef11 100644 --- a/src/chrome/locale/fo/torlauncher.properties +++ b/src/chrome/locale/fo/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(viðmælt) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd index 3661088..e189a46 100644 --- a/src/chrome/locale/fy/network-settings.dtd +++ b/src/chrome/locale/fy/network-settings.dtd @@ -4,8 +4,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Ja"> +<!ENTITY torSettings.no "Nee"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Wachtwurd:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/src/chrome/locale/fy/torlauncher.properties b/src/chrome/locale/fy/torlauncher.properties index 02be756..d735f57 100644 --- a/src/chrome/locale/fy/torlauncher.properties +++ b/src/chrome/locale/fy/torlauncher.properties @@ -27,13 +27,13 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(oanbefelle) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.done=Klear torlauncher.forAssistance=For assistance, contact %S diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index e377cdf..4d52e92 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -2,25 +2,25 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "לפני שאתה מתחבר לרשת ה-Tor, אתה צריך לספק מידע על חיבור האינטרנט של מחשב זה."> <!ENTITY torSettings.yes "כן"> <!ENTITY torSettings.no "לא"> <!ENTITY torSettings.firstQuestion "אילו מן הבאים מתאר את המצב שלך באופן הטוב ביותר?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "חיבור האינטרנט של המחשב הזה מצונזר או עובר בשרת פרוקסי"> +<!ENTITY torSettings.configurePrompt2 "אני צריך להגדיר גשר או הגדרות פרוקסי"> <!ENTITY torSettings.configure "הגדר"> <!ENTITY torSettings.connectPrompt2 "ברצוני להתחבר ישירות אל הרשת Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "זה יעבוד ברוב המקרים."> <!ENTITY torSettings.connect "התחבר"> <!ENTITY torSettings.proxyQuestion "האם מחשב זה צריך להשתמש בפרוקסי כדי לגשת אל האינטרנט?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> +<!ENTITY torSettings.proxyHelp "אם אינך בטוח איך לענות לשאלה זו, תבדוק את הגדרות האינטרנט בדפדפן אחר, לראות האם הוא מוגדר להשתמש בפרוקסי."> <!ENTITY torSettings.enterProxy "הזן את הגדרות הפרוקסי."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeQuestion "האם ספק שירותי האינטרנט (ISP) שלך חוסם או מצנזר אחרת חיבורים לרשת Tor ?"> +<!ENTITY torSettings.bridgeHelp "אם אינך בטוח איך לענות לשאלה הזו, בחר No.  במידה ותבחר כן, תתבקש להגדיר את גשרי Tor, שהם ממסרים לא רשומים שמקשים לחסום חיבורים לרשת Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  diff --git a/src/chrome/locale/he/progress.dtd b/src/chrome/locale/he/progress.dtd index 136f245..2e3d2c3 100644 --- a/src/chrome/locale/he/progress.dtd +++ b/src/chrome/locale/he/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "מצב Tor"> <!ENTITY torprogress.openSettings "פתח הגדרות"> <!ENTITY torprogress.heading "מתחבר כעת אל רשת Tor"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "בבקשה המתן בזמן שאנחנו יוצרים חיבור לרשת ה-Tor"> diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd index 572c45e..cfb3590 100644 --- a/src/chrome/locale/hy-AM/network-settings.dtd +++ b/src/chrome/locale/hy-AM/network-settings.dtd @@ -5,7 +5,7 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.no "Ոչ"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index e1b9efd..c1c6e5d 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -9,7 +9,7 @@ <!ENTITY torSettings.firstQuestion "Yang mana dari di bawah ini cocok dengan situasi anda?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Saya perlu mengkonfigurasi setelan Bridge atau proxy."> <!ENTITY torSettings.configure "Konfigur"> <!ENTITY torSettings.connectPrompt2 "Saya ingin menghubungkan secara langsung ke jaringan Tor."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Menunggu Tor untuk memulai..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Muat ulang Tor"> <!ENTITY torsettings.optional "Opsional"> @@ -57,6 +57,6 @@ <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, atau https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/id/torlauncher.properties b/src/chrome/locale/id/torlauncher.properties index fc86fca..cc23057 100644 --- a/src/chrome/locale/id/torlauncher.properties +++ b/src/chrome/locale/id/torlauncher.properties @@ -3,50 +3,50 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port Tor +torlauncher.tor_exited=Tor keluar mendadak. Ini dapat terjadi karena bug dalam Tor, atau program lain di sistem Anda, atau kerusakan perangkat keras. Sampai anda memuat ulang Tor, Browser Tor tidak dapat mencapai situs web apapun. Jika masalah ini terus bertahan, mohon mengirimkan salinan dari log Tor Anda kepada tim pendukung. +torlauncher.tor_exited2=Memuat ulang Tor tidak akan menutup tab browser Anda. +torlauncher.tor_controlconn_failed=Tidak dapat tersambung pada port kontrol Tor. torlauncher.tor_failed_to_start=Tor gagal untuk memulai. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor tidak dapat tersambung pada jaringan. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_control_failed=Gagal untuk mendapatkan kontrol Tor. +torlauncher.tor_bootstrap_failed=Tor gagal menghasilkan koneksi jaringan Tor. +torlauncher.tor_bootstrap_failed_details=%1$S gagal (%2$S). torlauncher.unable_to_start_tor=Tidak dapat memulai Tor\n\n%S torlauncher.tor_missing=Tor executable hilang torlauncher.torrc_missing=File torrc hilang -torlauncher.datadir_missing=Tor data direktori tidak ada. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.datadir_missing=Direktori data Tor tidak ada. +torlauncher.password_hash_missing=Gagal mendapatkan kata sandi hashed. -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Gagal mendapatkan pengaturan Tor.\n\n%S +torlauncher.failed_to_save_settings=Tidak dapat menyimpan pengaturan Tor.\n\n%S +torlauncher.ensure_tor_is_running=Mohon pastikan Tor sedang berjalan. -torlauncher.error_proxy_addr_missing=Anda harus menentukan baik alamat IP atau nama host dan nomor port untuk mengkonfigurasi Tor untuk menggunakan proxy untuk mengakses Internet. +torlauncher.error_proxy_addr_missing=Anda harus menentukan baik alamat IP atau nama host dan nomor port untuk mengkonfigurasi Tor supaya menggunakan sebuah proxy untuk mengakses Internet. torlauncher.error_proxy_type_missing=Anda harus memilih jenis proxy. torlauncher.error_bridges_missing=Anda harus menspesifikan satu bridge atau lebih. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Anda harus memilih satu tipe transportasi untuk bridges yang tersedia. +torlauncher.error_bridge_bad_default_type=Tidak ada bridges tersedia yang memiliki tipe transportasi %S tersedia. Mohon sesuaikan pengaturan Anda. torlauncher.recommended_bridge=(recommended) torlauncher.connect=Hubungi -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Muat ulang Tor torlauncher.quit=Berhenti torlauncher.quit_win=Keluar torlauncher.done=Selesai. -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Untuk bantuan, hubungi $S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Penyalinan selesai. %S log pesan Tor telah siap untuk ditempelkan ke dalam editor text atau pesan email. -torlauncher.bootstrapStatus.conn_dir=Menghubungkan diri ke direktori relay +torlauncher.bootstrapStatus.conn_dir=Menghubungkan ke direktori relay torlauncher.bootstrapStatus.handshake_dir=Membuat koneksi direktori terenkripsi torlauncher.bootstrapStatus.requesting_status=Mengambil status jaringan torlauncher.bootstrapStatus.loading_status=Memuat status jaringan torlauncher.bootstrapStatus.loading_keys=Memuat sertifikat otoritas torlauncher.bootstrapStatus.requesting_descriptors=Meminta informasi relay torlauncher.bootstrapStatus.loading_descriptors=Memuat informasi relay -torlauncher.bootstrapStatus.conn_or=Menghubungkan diri ke jaringan Tor +torlauncher.bootstrapStatus.conn_or=Menghubungkan ke jaringan Tor torlauncher.bootstrapStatus.handshake_or=Membuat sirkuit Tor torlauncher.bootstrapStatus.done=Telah terhubung ke jaringan Tor @@ -58,4 +58,4 @@ torlauncher.bootstrapWarning.identity=identitas tidak cocok torlauncher.bootstrapWarning.timeout=waktu koneksi habis torlauncher.bootstrapWarning.noroute=tidak ada rute ke host torlauncher.bootstrapWarning.ioerror=error baca/tulis -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=kehilangan pluggable transport diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 76034db..a5a7768 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -18,7 +18,7 @@ <!ENTITY torSettings.proxyQuestion "このコンピューターはインターネットにアクセスするのにプロキシが必要ですか？">  <!ENTITY torSettings.proxyHelp "この質問にどう答えるべきか確信が持てなければ、Proxyの使用がどのように設定されているか確認するために、他のブラウザのインターネット設定を見てください。"> -<!ENTITY torSettings.enterProxy "Proxy設定を入力"> +<!ENTITY torSettings.enterProxy "プロキシ設定を入力"> <!ENTITY torSettings.bridgeQuestion "あなたのインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックしているか、あるいは別のやり方で検閲していますか？"> <!ENTITY torSettings.bridgeHelp "この質問にどう答えるべきかよくわからない場合は、いいえを選択してください。  はいを選択すると、Tor ネットワークへの接続をブロックすることをさらに困難にするリスト化されていないリレーである Tor Bridges を構成することが求められます。"> <!ENTITY torSettings.bridgeSettingsPrompt "提供されたブリッジのセットを使用するか、あるいはカスタムのブリッジのセットを取得して入力することができます。"> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 2dd94b2..a89866e 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "아니오"> <!ENTITY torSettings.firstQuestion "어떤 것이 귀하의 상황에 가깝습니까?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열되어 있거나 프록시를 통합니다."> +<!ENTITY torSettings.configurePrompt2 "브릿지 또는 프록시 설정을 구성해야 합니다."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> <!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작합니다"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "웹을 통해"> <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org 를 방문하십시오."> <!ENTITY torsettings.bridgeHelp3Heading "메일 자동 응답 시스템을 통해"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "공개 브릿지 주소를 찾는 또 하나의 방법은 본문에 'get bridges'라고 적은 E-mail을 bridges(a)torproject.org 앞으로 보내는 것입니다.  단, 브릿지 주소를 크래커들이 수집하기 어렵게 하기 위해 아래의 이메일(우선순위대로 기재되어 있음)으로 보내주시면 감사하겠습니다."> +<!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.xn--org-568n 정중 한 메일 메시지를 보내 브릿지 주소를 요청할 수 있습니다.  사람이 각 요청에 대응할 필요가 있다는 점에 주의해주십시오"> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 5ebf2d7..c20a6ac 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=완료 torlauncher.forAssistance=지원자 연결 %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 됩니다. torlauncher.bootstrapStatus.conn_dir=중계서버 디렉토리에 연결 torlauncher.bootstrapStatus.handshake_dir=암호화된 디렉터리 연결을 설정 diff --git a/src/chrome/locale/lo/torlauncher.properties b/src/chrome/locale/lo/torlauncher.properties index 3640155..a849dfe 100644 --- a/src/chrome/locale/lo/torlauncher.properties +++ b/src/chrome/locale/lo/torlauncher.properties @@ -1,9 +1,9 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=ໂຕເປີດ Tor -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited=ອອກຈາກ Tor ໂດຍບໍ່ຄາດຄິດ. ນີ້ອາດເປັນຍ້ອນຂໍ້ຜິດພາດໃນໂຕ ຂອງ Tor ເອງ, ຈາກໂປຣແກຣມອື່ນໃນລະບົບຂອງທ່ານ ຫຼື ຂໍ້ຜິດພາດຈາກໂຕເຄື່ອງເອງ. Tor ຈະບໍ່ສາມາດເຂົ້າເຖິງ ເວັບໄຊຕ໌ ໃດໆໄດ້ ຈົນກວ່າ ທ່ານຈະແລ່ນ Tor ຄືນໃໝ່. ຖ້າຫາກວ່າ ບັນຫາຍັງເປັນຄືເກົ່າ, ກະລຸນາ ສົ່ງສຳເນົາບັນທຶກ Tor ຂອງ ທ່ານ ໄປຍັງ ໜ່ວຍງານສະໜັບສະໜູນໄດ້. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index 0e51ad5..3b50645 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor tinklo parametrai">  @@ -7,7 +7,7 @@ <!ENTITY torSettings.yes "Taip"> <!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Kuris iš žemiau pateiktų apibrėžimų labiausiai atspindi Jūsų padėtį?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> <!ENTITY torSettings.configure "Configure"> @@ -26,7 +26,7 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Pakartotinai paleisti Tor"> <!ENTITY torsettings.optional "Optional"> diff --git a/src/chrome/locale/lt/torlauncher.properties b/src/chrome/locale/lt/torlauncher.properties index b1f594d..99962c4 100644 --- a/src/chrome/locale/lt/torlauncher.properties +++ b/src/chrome/locale/lt/torlauncher.properties @@ -1,43 +1,43 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor Leistuvas -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +torlauncher.tor_exited=Tor netikėtai nustojo veikti. Taip galėjo atsitikti arba dėl klaidos Tor arba kitoje programoje, Jūsų sistemoje arba dėl sugedusios techninės įrangos. Kol iš naujo nepaleisite Tor, Tor Naršyklė negalės prisijungti prie jokių interneto tinklalapių. Jei problema kartojasi, prašome išsiųsti Tor įvykių žurnalo kopiją paramos grupei. +torlauncher.tor_exited2=Pakartotinai paleidus Tor naršyklės kortelės nebus uždarytos. +torlauncher.tor_controlconn_failed=Nepavyko prisijungti prie Tor valdymo prievado. torlauncher.tor_failed_to_start=Tor nepavyko paleisti. -torlauncher.tor_control_failed=Failed to take control of Tor. +torlauncher.tor_control_failed=Nepavyko perimti Tor valdymo torlauncher.tor_bootstrap_failed=Tor nepavyko užmegzti ryšio su Tor tinklu. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S nepavyko (%2$S). torlauncher.unable_to_start_tor=Nepavyksta paleisti Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.tor_missing=Trūksta Tor vykdomojo failo. +torlauncher.torrc_missing=Trūksta torrc failo +torlauncher.datadir_missing=Nesukurtas Tor duomenų aplankas +torlauncher.password_hash_missing=Nepavyko perskaityti slaptažodžio santrumpos -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.failed_to_get_settings=Nepavyko perskaityti Tor nustatymo parametrų.\n\n%S +torlauncher.failed_to_save_settings=Nepavyko įrašyti Tor nustatymo parametrų.\n\n%S +torlauncher.ensure_tor_is_running=Įsitikinkite, kad Tor yra vykdomas. -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_proxy_addr_missing=Jei norite, kad Tor prie interneto jungtųsi per įgaliotąjį serverį, turite nurodyti ir prievado numerį, ir serverio IP adresą arba serverio vardą. +torlauncher.error_proxy_type_missing=Turite pasirinkti įgaliotojo serverio tipą. +torlauncher.error_bridges_missing=Turite nurodyti bent vieną tinklų tiltą +torlauncher.error_default_bridges_type_missing=Turite pasirinkti perdavimo būdą nurodytiems tinklų tiltams +torlauncher.error_bridge_bad_default_type=Nepasiekiamas nei vienas tinklų tiltas, kurio perdavimo tipas būtų %S. Prašome pakoreguoti nustatymo parametrus. torlauncher.recommended_bridge=(rekomenduojama) torlauncher.connect=Prisijungti -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Pakartotinai paleisti Tor torlauncher.quit=Nutraukti torlauncher.quit_win=Išeiti torlauncher.done=Atlikta -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Jei Jums reikia pagalbos, susisiekti galite su %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopijavimas atliktas. %S Tor įvykių žurnalas paruoštas įklijuoti į teksto redagavimo programą ar elektroninio pašto pranešimą. torlauncher.bootstrapStatus.conn_dir=Jungiamasi prie retransliavimo taškų torlauncher.bootstrapStatus.handshake_dir=Užmezgiamas ryšys @@ -48,14 +48,14 @@ torlauncher.bootstrapStatus.requesting_descriptors=Užklausiama retransliacijos torlauncher.bootstrapStatus.loading_descriptors=Įkeliama retransliacijos taško informacija torlauncher.bootstrapStatus.conn_or=Jungiamasi prie Tor tinklo torlauncher.bootstrapStatus.handshake_or=Užmezgiamas sujungimas -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapStatus.done=Prisijungta prie Tor tinklo! + +torlauncher.bootstrapWarning.done=atlikta +torlauncher.bootstrapWarning.connectrefused=atsisakyta sujungti +torlauncher.bootstrapWarning.misc=įvairūs +torlauncher.bootstrapWarning.resourcelimit=nepakanka išteklių +torlauncher.bootstrapWarning.identity=tapatybės neatitiktis +torlauncher.bootstrapWarning.timeout=per nustatytą laiką nepavyko prisijungti +torlauncher.bootstrapWarning.noroute=nėra maršruto iki pagrindinio kompiuterio +torlauncher.bootstrapWarning.ioerror=skaitymo/rašymo klaida +torlauncher.bootstrapWarning.pt_missing=Trūksta įterpiamojo perdavimo diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index 63b8ede..6a33288 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tīkla Tor iestatījumi"> +<!ENTITY torsettings.dialog.title "Tor tīkla iestatījumi">  @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nē"> <!ENTITY torSettings.firstQuestion "Kura situācija vislabāk atbilst jūsējai?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Datora savienojums ar internetu ir cenzēts vai starpniekots."> +<!ENTITY torSettings.configurePrompt2 "Man jākonfigurē tiltu vai starpniekserveru iestatījumi."> <!ENTITY torSettings.configure "Konfigurēt"> <!ENTITY torSettings.connectPrompt2 "Es vēlos tieši pieslēgties tīklam Tor."> <!ENTITY torSettings.connectPrompt3 "Šis strādās vairumā gadījumu."> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Caur tīmekli"> <!ENTITY torsettings.bridgeHelp2 "Izmanto pārlūkprogrammu lai apmeklētu https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildētāju"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Sūtiet e-pastu uz bridges(a)torproject.org ar rindu 'get bridges' ziņojuma tekstā.  Taču, lai uzbrucējam būtu sarežģītāk uzzināt daudz tiltu adrešu, Jums jāsūta šis pieprasījums no kāda no šo e-pasta pakalpojumu sniedzēju e-pastiem (uzskatītiem vēlamās izvēles kārtībā):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com vai https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Caur Palīdzības Centru"> <!ENTITY torsettings.bridgeHelp4 "Pēdējās instances palīdzība tiltu adrešu pieprasījumiem ir sūtīt pieklājīgu e-pasta adresi uz help(a)rt.torproject.org.  Lūdzu, ņemiet vērā, ka ikvienu pieprasījumu izskata cilvēks."> diff --git a/src/chrome/locale/lv/torlauncher.properties b/src/chrome/locale/lv/torlauncher.properties index 8be9868..fff24bf 100644 --- a/src/chrome/locale/lv/torlauncher.properties +++ b/src/chrome/locale/lv/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Gatavs torlauncher.forAssistance=Lai saņemtu palīdzību, sazinieties ar %S -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopēšana paveikta. %S Tor žurnāla ziņojumi sagatavoti ielīmēšanai teksta redaktorā vai e-pasta ziņojumā. torlauncher.bootstrapStatus.conn_dir=Veido savienojumu ar retranslatoru direktoriju torlauncher.bootstrapStatus.handshake_dir=Izveido šifrētu savienojumu ar direktoriju diff --git a/src/chrome/locale/mr/torlauncher.properties b/src/chrome/locale/mr/torlauncher.properties index 2367cd5..010b0d4 100644 --- a/src/chrome/locale/mr/torlauncher.properties +++ b/src/chrome/locale/mr/torlauncher.properties @@ -27,7 +27,7 @@ torlauncher.error_bridges_missing=एक किंवा अधिक ब्र torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(शिफारस केलेली) torlauncher.connect=जोडा torlauncher.restart_tor=Restart Tor diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index 35f9827..e6d2ccc 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -2,7 +2,7 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Sebelum anda menyambung ke jaringan Tor, anda mestilah memberi maklumat tentang talian internet komputer ini terlebih dahulu."> <!ENTITY torSettings.yes "Ya"> <!ENTITY torSettings.no "Tidak"> diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index 217e82e..8fc9a22 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "Eg vil kopla til direkte til Tor-nettverket."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Dette vil fungera i dei fleste høve"> <!ENTITY torSettings.connect "Kopla til"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> diff --git a/src/chrome/locale/nn/torlauncher.properties b/src/chrome/locale/nn/torlauncher.properties index 2a7698b..062fb5c 100644 --- a/src/chrome/locale/nn/torlauncher.properties +++ b/src/chrome/locale/nn/torlauncher.properties @@ -9,7 +9,7 @@ torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_bootstrap_failed_details=%1$S feila (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. @@ -33,7 +33,7 @@ torlauncher.connect=Kople til torlauncher.restart_tor=Start Tor på nytt torlauncher.quit=Avslutt torlauncher.quit_win=Avslutt -torlauncher.done=Done +torlauncher.done=Ferdig torlauncher.forAssistance=For hjelp, kontakt %S @@ -50,9 +50,9 @@ torlauncher.bootstrapStatus.conn_or=Koplar til Tor-nettverket torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Kopla til Tor-nettverket! -torlauncher.bootstrapWarning.done=done +torlauncher.bootstrapWarning.done=ferdig torlauncher.bootstrapWarning.connectrefused=tilkopling avslått -torlauncher.bootstrapWarning.misc=miscellaneous +torlauncher.bootstrapWarning.misc=ymse torlauncher.bootstrapWarning.resourcelimit=insufficient resources torlauncher.bootstrapWarning.identity=identity mismatch torlauncher.bootstrapWarning.timeout=connection timeout diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index b78b35c..2b673b5 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Não"> <!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> -<!ENTITY torSettings.configurePrompt1 "A conexão internet deste computador encontra-se sob censura ou proxy."> -<!ENTITY torSettings.configurePrompt2 "É preciso configurar bridge ou "> +<!ENTITY torSettings.configurePrompt1 "A conexão Internet deste computador foi censurada, filtrada ou limitada por um proxy."> +<!ENTITY torSettings.configurePrompt2 "Preciso configurar bridge ou configurações de proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connectPrompt2 "Eu gostaria de me conectar diretamente à rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos."> diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index cc07448..2c6d361 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -8,8 +8,8 @@ <!ENTITY torSettings.no "Nu"> <!ENTITY torSettings.firstQuestion "Care din următoarele descrie cel mai bine situația dvs?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> +<!ENTITY torSettings.configurePrompt1 "Această conexiune la internet a computerului este cenzurată sau prin proxy."> +<!ENTITY torSettings.configurePrompt2 "Trebuie să configurez puntea sau configurări proxy."> <!ENTITY torSettings.configure "Configuraţi "> <!ENTITY torSettings.connectPrompt2 "Vreau sa ma conectez direct la reţeaua Tor ."> <!ENTITY torSettings.connectPrompt3 "Aceasta funcționează în cele mai multe situații."> @@ -56,7 +56,7 @@ <!ENTITY torsettings.bridgeHelp2Heading "Prin Web"> <!ENTITY torsettings.bridgeHelp2 "Folosiți un webbrowser pentru a vizita https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Prin email automat"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Trimiteți email la bridges(a)torproject.org cu linia 'get bridges' inclusă în contextul message.  Totuși, pentru a face dificil unui atacator să învețe cât mai multe adrese de punți, trebuie să trimiteți această cerere de la unul dintre următorii furnizori de servicii email (listați în ordinea preferinței):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, sau https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Prin Help Desk"> <!ENTITY torsettings.bridgeHelp4 "Ca o ultimă soluție, puteți cere adrese de punți trimițînd un email politicos la help(a)rt.torproject.org.  Remarcați că o persoană trebuie să răspundă la fiecare cerere."> diff --git a/src/chrome/locale/ru/torlauncher.properties b/src/chrome/locale/ru/torlauncher.properties index 1e374d2..127e367 100644 --- a/src/chrome/locale/ru/torlauncher.properties +++ b/src/chrome/locale/ru/torlauncher.properties @@ -3,11 +3,11 @@ torlauncher.error_title=Загрузчик Tor -torlauncher.tor_exited=Tor неожидано завершил работу. Это может быть вызвано ошибкой в сомом Tor, другой программой на компьютере или неисправным оборудованиемю. Пока Tor не будет перезапущен, веб-страницы будут недоступны через Tor Browser. Если проблема неустранима, пожалуйста, отправте копию ваших логов Tor нашей команде поддержки. +torlauncher.tor_exited=Tor неожидано завершил работу. Это может быть вызвано сбоем в самом Tor, другой программой на вашем компьютере или его неисправностью. Пока Tor не будет перезапущен, веб-страницы через Tor Browser будут недоступны. Если проблема не устраняется, пожалуйста, отправьте копию ваших логов Tor нашей команде поддержки. torlauncher.tor_exited2=Перезапуск Тор не закроет вкладки браузера. torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor. torlauncher.tor_failed_to_start=Невозможно запустить Tor. -torlauncher.tor_control_failed=Не удалось взять контроль над Tor. +torlauncher.tor_control_failed=Не удалось установить связь с Tor. torlauncher.tor_bootstrap_failed=Тор не удалось установить подключение к сети Tor. torlauncher.tor_bootstrap_failed_details=%1$S неудачно (%2$S). @@ -17,13 +17,13 @@ torlauncher.torrc_missing=Файл torrc отсутствует. torlauncher.datadir_missing=Каталог данных Tor не существует. torlauncher.password_hash_missing=Не удаётся получить хэшированный пароль. -torlauncher.failed_to_get_settings=Не удаётся считать настройки Tor.\n\n%S +torlauncher.failed_to_get_settings=Не удаётся загрузить настройки Tor.\n\n%S torlauncher.failed_to_save_settings=Не удаётся сохранить настройки Tor.\n\n%S torlauncher.ensure_tor_is_running=Убедитесь что Tor запущен. torlauncher.error_proxy_addr_missing=Вы должны указать IP-адрес или имя хоста и порт, чтобы настроить Tor и использовать прокси для доступа в Интернет. torlauncher.error_proxy_type_missing=Необходимо выбрать тип прокси. -torlauncher.error_bridges_missing=Необходимо задать один или несколько мостов. +torlauncher.error_bridges_missing=Необходимо указать один или несколько мостов. torlauncher.error_default_bridges_type_missing=Вы должны выбрать тип транспорта предопределенных мостов. torlauncher.error_bridge_bad_default_type=Предопределенные мосты не поддерживают тип транспорта %S. Пожалуйста, исправьте ваши настройки. diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd index 3661088..6448004 100644 --- a/src/chrome/locale/sl-SI/network-settings.dtd +++ b/src/chrome/locale/sl-SI/network-settings.dtd @@ -1,62 +1,62 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor mrežne nastavitve">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Preden se povežete na Tor omrežje, si morate priskrbeti informacije o tej računalniški internet povezavi."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Da"> +<!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.firstQuestion "Kaj od sledečega najbolj ustzrezno opisuje vašo situacijo?"> +<!ENTITY torSettings.configurePrompt1 "Ta računalniška internet povezava je cenzurirana ali neposredna."> +<!ENTITY torSettings.configurePrompt2 "Nastaviti moram premostitev ali nastavitev proxi-ja."> +<!ENTITY torSettings.configure "Oblikovanje"> +<!ENTITY torSettings.connectPrompt2 "Hočem se neposredno povezati na Tor omrežje."> +<!ENTITY torSettings.connectPrompt3 "To deluje v večini primerov."> +<!ENTITY torSettings.connect "Povezava"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Ali ta računalnik rabi proxy za vstop na internet?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.proxyHelp "Če niste prepričani za odgovor, poglejte internetne nastavitve v drugem brskalniku, da vidite, ali je nastavljen tako, da uporabljate proxy."> +<!ENTITY torSettings.enterProxy "Vnesite nastavitve strežnika proxy."> +<!ENTITY torSettings.bridgeQuestion "Ali vaš internetni ponudnik (ISP) blokira ali kako drugače cenzurira povezavo na Tor omrežje?"> +<!ENTITY torSettings.bridgeHelp "Če niste prepričani kako odgovoriti na to vprašanje, izberite Ne.  Če ste izbrali Da, boste morali nastaviti Tor premostitve na nenašteta vozlišča, za težje blokiranje povezave na Tor omrežje."> +<!ENTITY torSettings.bridgeSettingsPrompt "Lahko uporabite pripravljene nastavitve povezav ali pridobite in vnesete običajne nastavitve povezav.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.startingTor "Čakanje na zagon Tor-a..."> +<!ENTITY torsettings.restartTor "Ponovno zaženite Tor"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Po izbiri"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.checkbox "Računalnik rabi uporabo proxy-ja za dostop na internet"> +<!ENTITY torsettings.useProxy.type "Proxy tip:"> +<!ENTITY torsettings.useProxy.address "Naslov:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP naslov ali ime domene"> +<!ENTITY torsettings.useProxy.port "Vhod:"> +<!ENTITY torsettings.useProxy.username "Uporabniško ime:"> +<!ENTITY torsettings.useProxy.password "Geslo:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> +<!ENTITY torsettings.firewall.checkbox "Računalnik uporablja požarni zid, ki dovoljuje povezavo le na določena vrata"> +<!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata:"> +<!ENTITY torsettings.useBridges.checkbox "Moj internetni ponudnik (ISP) blokira povezave na Tor omrežje"> +<!ENTITY torsettings.useBridges.default "Povezava z ponujeno premostitvijo"> +<!ENTITY torsettings.useBridges.type "Tip prometa:"> +<!ENTITY torsettings.useBridges.custom "Vnesite običajne premostitve"> +<!ENTITY torsettings.useBridges.label "Vnesite enega ali več premostitvenih vozlišč (vsakega v svojo vrsto)"> +<!ENTITY torsettings.useBridges.placeholder "vpišite naslov:vrata"> + +<!ENTITY torsettings.copyLog "Kopirajte Tor poročilo v odložišče"> +<!ENTITY torsettings.bridgeHelpTitle "Pomoč premostitveno vozlišče"> +<!ENTITY torsettings.bridgeHelp1 "Če se ne morete povezati v omrežje Tor, je mogoče, da vaš ponudnik internetnih storitev (ISP) ali druga agencija blokira Tor.  Pogosto lahko to obidete s pomočjo Tor premostitvijo, na nenašteta vozlišča, za težje blokiranje."> +<!ENTITY torsettings.bridgeHelp1B "Uporabite lahko že prednastavljen, ponujen niz premostitvenih naslovov ali pa lahko pridobite običajen set naslovov z uporabo enega od treh načinov:"> +<!ENTITY torsettings.bridgeHelp2Heading "Preko Web"> +<!ENTITY torsettings.bridgeHelp2 "Uporabite web brskalnik za obisk https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Preko poštnega avtomatskega odzivnika"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Pošljite e-pošto na bridges(a)torproject.org z vrstico 'get bridges' v sporočilu. Vendar pa, da otežite napadalcu učenje o vozliščnih naslovih, morate poslati ta zahtevek iz enega od naslednjih ponudnikov e-pošte (navedene po prednostnem vrstnem redu):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4Heading "Preko table Pomoči"> +<!ENTITY torsettings.bridgeHelp4 "Kot skrajni ukrep, lahko zahtevate premostitvene naslove s pošiljanjem olikanega e-sporočila na help(a)rt.torproject.org.  Prosimo, upoštevajte, da dotična oseba odgovarja na vsako zahtevo."> diff --git a/src/chrome/locale/sl-SI/progress.dtd b/src/chrome/locale/sl-SI/progress.dtd index ebd9cef..3153326 100644 --- a/src/chrome/locale/sl-SI/progress.dtd +++ b/src/chrome/locale/sl-SI/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.dialog.title "Tor stanje"> +<!ENTITY torprogress.openSettings "Odpri Nastavitve"> +<!ENTITY torprogress.heading "Povezovanje v Tor omrežje"> +<!ENTITY torprogress.pleaseWait "Prosim počakajte, da se stabilizira povezava v Tor omrežje."> diff --git a/src/chrome/locale/sl-SI/torlauncher.properties b/src/chrome/locale/sl-SI/torlauncher.properties index 02be756..e083df9 100644 --- a/src/chrome/locale/sl-SI/torlauncher.properties +++ b/src/chrome/locale/sl-SI/torlauncher.properties @@ -1,61 +1,61 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). - -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. - -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.recommended_bridge=(recommended) - -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done - -torlauncher.forAssistance=For assistance, contact %S - -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. - -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.error_title=Tor zaganjalnik + +torlauncher.tor_exited=Nepričakovan izstop Tor-a. To je lahko posledica napake v Tor-u samem, drugega programa na vašem sistemu, ali pomanjkljive opreme. Dokler ne boste ponovno zagnali Tor, Tor brskalnik ne more odpreti nobene spletne strani. Če se težave nadaljujejo, prosimo, pošljite kopijo Tor poročila ekipi za podporo. +torlauncher.tor_exited2=Ponoven zagon Tor-a ne bo zaprl tabulatorjev brskalnika +torlauncher.tor_controlconn_failed=Nemogoče se povezati z Tor kontrolnimi vrati +torlauncher.tor_failed_to_start=Tor se ni zagnal. +torlauncher.tor_control_failed=Neuspešen nadzor Tor-a. +torlauncher.tor_bootstrap_failed=Tor ni mogel vzpostaviti Tor mrežno povezavo +torlauncher.tor_bootstrap_failed_details=%1$S neuspešno (%2$S). + +torlauncher.unable_to_start_tor=Nemogoče zagnati Tor,\n\n%S +torlauncher.tor_missing=Tor zagonska manjka. +torlauncher.torrc_missing=Torrc datoteka manjka. +torlauncher.datadir_missing=Tor imenik podatkov ne obstoja. +torlauncher.password_hash_missing=Neuspelo pridobivanje hash gesla. + +torlauncher.failed_to_get_settings=Ni moč pridobiti nastavitve Tor,\n\n%S +torlauncher.failed_to_save_settings=Nastavitve Tor ni mogoče shraniti,\n\n%S +torlauncher.ensure_tor_is_running=Prepričajte se, da Tor deluje. + +torlauncher.error_proxy_addr_missing=Določiti morate tako IP-naslov ali ime gostitelja in številko vrat, da nastavite Tor uporabo proxi-ja za dostop do interneta. +torlauncher.error_proxy_type_missing=Izbrati morate tip proxi-ja +torlauncher.error_bridges_missing=Določiti morate enega ali več mostičkov. +torlauncher.error_default_bridges_type_missing=Izbrati morate tip prometa za ponujene premostitve. +torlauncher.error_bridge_bad_default_type=Nobenih ponujenih premostitev, ki imajo tip transporta% S ni na voljo. Prosimo, da prilagodite nastavitve. + +torlauncher.recommended_bridge=(priporočljivo) + +torlauncher.connect=Povezava +torlauncher.restart_tor=Ponovno zaženite Tor +torlauncher.quit=Opusti +torlauncher.quit_win=Izhod +torlauncher.done=Narejeno + +torlauncher.forAssistance=Za podporo, stik %S + +torlauncher.copiedNLogMessages=Kopiranje končano. % S Tor poročila so pripravljena za lepljenje v urejevalnik besedil ali e-poštno sporočilo. + +torlauncher.bootstrapStatus.conn_dir=Povezovanje na imenik vmesnika +torlauncher.bootstrapStatus.handshake_dir=Urejanje šifriranega imenika povezave +torlauncher.bootstrapStatus.requesting_status=Stanje vzpostavljenega omrežja +torlauncher.bootstrapStatus.loading_status=Stanje nalaganja omrežja +torlauncher.bootstrapStatus.loading_keys=Nalaganje veljavnosti certifikatov +torlauncher.bootstrapStatus.requesting_descriptors=Info zahtevanih vmesnikov +torlauncher.bootstrapStatus.loading_descriptors=Nalaganje informacij vmesnikov +torlauncher.bootstrapStatus.conn_or=Povezovanje v Tor omrežje +torlauncher.bootstrapStatus.handshake_or=Vzpostavljanje Tor povezave +torlauncher.bootstrapStatus.done=Povezan v Tor omrežje + +torlauncher.bootstrapWarning.done=narejeno +torlauncher.bootstrapWarning.connectrefused=povezava zavrnjena +torlauncher.bootstrapWarning.misc=razno +torlauncher.bootstrapWarning.resourcelimit=nezadostni viri +torlauncher.bootstrapWarning.identity=zmešnjava identitet +torlauncher.bootstrapWarning.timeout=potekel čas povezave +torlauncher.bootstrapWarning.noroute=ni poti gostitelja +torlauncher.bootstrapWarning.ioerror=napaka read/write +torlauncher.bootstrapWarning.pt_missing=manjka vtični promet diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index 0fb1cbf..ed1ea8b 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -1,62 +1,62 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Подешавања Тор мреже">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Пре него што се повежете на Тор мрежу, требало би да пружите информације о интернет конекцији овог рачунара."> <!ENTITY torSettings.yes "Da"> <!ENTITY torSettings.no "NE"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.firstQuestion "Шта од понуђеног најбоље описује Вашу ситуацију?"> +<!ENTITY torSettings.configurePrompt1 "Интернет конекција овог рачунара је цензурисана или посредована."> +<!ENTITY torSettings.configurePrompt2 "Требало би да конфигуришем подешавања премошћивача или proxy."> +<!ENTITY torSettings.configure "Конфигуриши"> +<!ENTITY torSettings.connectPrompt2 "Желео бих да се повежем директно на Тор мрежу."> +<!ENTITY torSettings.connectPrompt3 "Ово ће радити у већини ситуација."> <!ENTITY torSettings.connect "Повежи се"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Да ли овај рачунар мора да користи посредника да би приступио интернету?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.proxyHelp "Ако нисте сигурни како да одговорите на ово питање, погледајте интернет подешавања у другом прегледачу да видите да ли је подешен да користи proxy."> +<!ENTITY torSettings.enterProxy "Унесите proxy подешавања."> +<!ENTITY torSettings.bridgeQuestion "Да ли Ваш интернет сервис провајдер (ИСП) блокира или на неки други начин цензурише повезивање на Тор мрежу?"> +<!ENTITY torSettings.bridgeHelp "Ако нисте сигурни како да одговорите на ово питање, изаберите Не.  Ако изаберете Да, бићете замољени да подесите Тор Премошћиваче, који су неизлистани преносници чија је улога да отежавају блокирање повезивања на Тор мрежу."> +<!ENTITY torSettings.bridgeSettingsPrompt "Можете користити понуђени сет премошћивача или можете добавити или унети жељени сет премошћивача.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.startingTor "Чекамо да се Тор покрене..."> +<!ENTITY torsettings.restartTor "Поново покрени Тор"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Опционо"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.checkbox "Овај рачунар мора да користи proxy да би приступио интернету."> +<!ENTITY torsettings.useProxy.type "Врста proxyja:"> <!ENTITY torsettings.useProxy.address "Adresa:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.address.placeholder "IP адреса или hostname"> <!ENTITY torsettings.useProxy.port "Порт:"> <!ENTITY torsettings.useProxy.username "Корисничко име:"> <!ENTITY torsettings.useProxy.password "Lozinka:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Овај рачунар пролази кроз firewall који дозвољава само конекције на одређене портове."> <!ENTITY torsettings.firewall.allowedPorts "Дозвољени Портови:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.checkbox "Мој интернет сервис провајдер (ИСП) блокира повезивање на Тор мрежу."> +<!ENTITY torsettings.useBridges.default "Повежите се са понуђеним премошћивачима"> +<!ENTITY torsettings.useBridges.type "Врста транспорта:"> +<!ENTITY torsettings.useBridges.custom "Унесите жељене премошћиваче"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "куцајте aдреса:порт"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2Heading "Кроз Мрежу"> +<!ENTITY torsettings.bridgeHelp2 "Користите веб прегледач да посетите https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, или https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/sr/torlauncher.properties b/src/chrome/locale/sr/torlauncher.properties index 02ae889..9b0e52c 100644 --- a/src/chrome/locale/sr/torlauncher.properties +++ b/src/chrome/locale/sr/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Тоr Покретач -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=Тор је неочекивано изашао. Ово може бити услед грешке у самом Тору, другом програму у Вашем систему, или неисправном хардверy. Пре него што поново покренете Тор, Тор прегледач неће бити у могућности да досегне ниједан сајт. Ако се проблем настави, молимо Вас да пошаљете копију Вашег Тор лога тиму за подршку. +torlauncher.tor_exited2=Поново покретање Тора неће затворити Ваше картице у прегледачу. torlauncher.tor_controlconn_failed=Повезивање на Tor port није успело torlauncher.tor_failed_to_start=Tor није успео да се покрене torlauncher.tor_control_failed=Неуспело преузимање контроле над Tor-om @@ -30,14 +30,14 @@ torlauncher.error_bridge_bad_default_type=Не постоје услови да torlauncher.recommended_bridge=(препоручено) torlauncher.connect=Повежи се -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Поново покрени Тор torlauncher.quit=Искључити torlauncher.quit_win=Излаз torlauncher.done=Gotovo torlauncher.forAssistance=За помоћ контактирајте %Ѕ -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Копирање завршено. %S Top лог поруке су спремне да буду налепљене у уређивач текста или у поруку у електронској пошти. torlauncher.bootstrapStatus.conn_dir=Повезивање са релеј директоријумом torlauncher.bootstrapStatus.handshake_dir=Успостављање шифроване везе директоријума diff --git a/src/chrome/locale/sv/progress.dtd b/src/chrome/locale/sv/progress.dtd index 878976d..c42db4e 100644 --- a/src/chrome/locale/sv/progress.dtd +++ b/src/chrome/locale/sv/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor status"> +<!ENTITY torprogress.dialog.title "Tor-status"> <!ENTITY torprogress.openSettings "Öppna inställningar"> <!ENTITY torprogress.heading "Ansluter till Tor-nätverket"> -<!ENTITY torprogress.pleaseWait "Var vänlig vänta medans vi etablerar en anslutning till Tor-nätverket."> +<!ENTITY torprogress.pleaseWait "Vänta medan vi upprättar en anslutning till Tor-nätverket."> diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index f3839f3..095d0b7 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -3,10 +3,10 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på en bugg i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor logg till vår support. +torlauncher.tor_exited=Tor stängdes oväntat ner. Det kan bero på en bugg i Tor eller i ett annat program på din dator, eller ett hårdvarufel. Tor Browser kommer inte kunna komma åt några sidor förrän du har startat om Tor. Om problemet återkommer, skicka en kopia på din Tor-logg till vår support. torlauncher.tor_exited2=Att starta om Tor kommer inte stänga några av dina flikar i webbläsaren. torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport. -torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades. +torlauncher.tor_failed_to_start=Det gick inte att starta Tor. torlauncher.tor_control_failed=Misslyckades med att ta kontroll över Tor. torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprätta en anslutning till Tor-nätverket. torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S). @@ -37,7 +37,7 @@ torlauncher.done=Klar torlauncher.forAssistance=För assistans, kontakta %S -torlauncher.copiedNLogMessages=Kopieringen är färdig. %S meddelanden från Tor-loggen som du kan klistra in i en texteditor eller ett e-postmeddelande. +torlauncher.copiedNLogMessages=Kopieringen är färdig. %S meddelanden från Tor-loggen som du kan klistra in i en textredigerare eller ett e-postmeddelande. torlauncher.bootstrapStatus.conn_dir=Ansluter till en reläkatalog torlauncher.bootstrapStatus.handshake_dir=Skapar en krypterad kataloganslutning @@ -46,7 +46,7 @@ torlauncher.bootstrapStatus.loading_status=Läser in nätverksstatus torlauncher.bootstrapStatus.loading_keys=Läser in auktoritära certifikat torlauncher.bootstrapStatus.requesting_descriptors=Begär reläinformation torlauncher.bootstrapStatus.loading_descriptors=Läser in reläinformation -torlauncher.bootstrapStatus.conn_or=Ansluter till Tor nätverket +torlauncher.bootstrapStatus.conn_or=Ansluter till Tor-nätverket torlauncher.bootstrapStatus.handshake_or=Skapar en Tor-krets torlauncher.bootstrapStatus.done=Ansluten till Tor-nätverket! diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 4db8e1c..802e83c 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torSettings.no "Hayır"> <!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> -<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın internet bağlantısı sansürlü veya vekil sunucu arkasında."> +<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın İnternet bağlantısı sansürlü veya vekil sunucu arkasında."> <!ENTITY torSettings.configurePrompt2 "Köprü veya vekil sunucu ayarlarını yapılandırmam gerekli."> <!ENTITY torSettings.configure "Yapılandır"> <!ENTITY torSettings.connectPrompt2 "Doğrudan Tor ağına bağlanmak istiyorum"> @@ -17,10 +17,10 @@ <!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternete erişirken bir vekil kullanması gerekiyor mu?">  -<!ENTITY torSettings.proxyHelp "Eğer bu soruyu nasıl yanıtlayacağınızdan emin değilseniz, farklı bir tarayıcıda İnternet seçeneklerine bakın ve bir vekil kullanmak üzere yapılandırılıp yapılandırılmadığına bakın"> +<!ENTITY torSettings.proxyHelp "Eğer bu soruyu nasıl yanıtlayacağınızdan emin değilseniz, farklı bir tarayıcıda İnternet seçeneklerine bakın ve bir vekil kullanmak üzere yapılandırılıp yapılandırılmadığını denetleyin."> <!ENTITY torSettings.enterProxy "Vekil ayarlarını girin."> <!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına bağlantıları engelliyor veya sansürlüyor mu?"> -<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır'ı Seçin.  Eğer Evet'i seçerseniz, Tor Ağına bağlantıyı engellemeyi daha zor hale getiren listelenmeyen aynalar olan Tor Köprülerini yapılandırmanız istenecektir."> +<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır'ı Seçin.  Evet'i seçerseniz, Tor Ağına bağlantıyı engellemeyi daha zor hale getiren listelenmeyen aynalar olan Tor Köprülerini yapılandırmanız istenecektir."> <!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprülerin kümesini kullanabilirsiniz veya özel bir köprü seti girebilir veya sağlayabilirsiniz.">  diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd index 4a46cde..b17bf4b 100644 --- a/src/chrome/locale/tr/progress.dtd +++ b/src/chrome/locale/tr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Durumu"> <!ENTITY torprogress.openSettings "Ayarları Aç"> <!ENTITY torprogress.heading "Tor ağına bağlanıyor"> -<!ENTITY torprogress.pleaseWait "Biz Tor şebekesi ile bağlantı kurana kadar lütfen bekleyin."> +<!ENTITY torprogress.pleaseWait "Biz Tor ağı ile bağlantı kurana kadar lütfen bekleyin."> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index f18ee80..f4ca504 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -25,7 +25,7 @@ torlauncher.error_proxy_addr_missing=İnternete bağlanırken vekil sunucusu kul torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. torlauncher.error_bridges_missing=Bir ya da daha fazla köprü belirtmelisiniz. torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım türü seçmelisiniz. -torlauncher.error_bridge_bad_default_type=%S aktarım türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı lütfen ayarlayın. +torlauncher.error_bridge_bad_default_type=%S aktarım türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı değiştirin. torlauncher.recommended_bridge=(önerilen) @@ -41,9 +41,9 @@ torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük mesajları torlauncher.bootstrapStatus.conn_dir=Bir ayna dizinine bağlanıyor torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı kuruluyor -torlauncher.bootstrapStatus.requesting_status=Ağ durumu güncelliyor +torlauncher.bootstrapStatus.requesting_status=Ağ durumu alınıyor torlauncher.bootstrapStatus.loading_status=Ağ durumu yükleniyor -torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikalarını yüklüyor +torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikaları yükleniyor torlauncher.bootstrapStatus.requesting_descriptors=Ayna bilgisi isteniyor torlauncher.bootstrapStatus.loading_descriptors=Ayna bilgisi yükleniyor torlauncher.bootstrapStatus.conn_or=Tor ağına bağlanıyor @@ -51,11 +51,11 @@ torlauncher.bootstrapStatus.handshake_or=Tor ağına bağlantı sağlanıyor torlauncher.bootstrapStatus.done=Tor ağına bağlandı! torlauncher.bootstrapWarning.done=tamam -torlauncher.bootstrapWarning.connectrefused=Bağlantı red edildi -torlauncher.bootstrapWarning.misc=Diğer -torlauncher.bootstrapWarning.resourcelimit=Yetersiz kaynak +torlauncher.bootstrapWarning.connectrefused=bağlantı geri çevrildi +torlauncher.bootstrapWarning.misc=çeşitli +torlauncher.bootstrapWarning.resourcelimit=yetersiz kaynak torlauncher.bootstrapWarning.identity=kimlik uyumsuz -torlauncher.bootstrapWarning.timeout=Zaman aşımı -torlauncher.bootstrapWarning.noroute=Yönlendirilecek sunucu yok -torlauncher.bootstrapWarning.ioerror=Okuma/yazma hatası +torlauncher.bootstrapWarning.timeout=zaman aşımı +torlauncher.bootstrapWarning.noroute=yönlendirilecek sunucu yok +torlauncher.bootstrapWarning.ioerror=okuma/yazma hatası torlauncher.bootstrapWarning.pt_missing=takılabilir taşıma kayıp diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index ed3f796..7cb086b 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -29,7 +29,7 @@ torlauncher.error_bridge_bad_default_type=沒有可用的傳輸類型為 %S 的 torlauncher.recommended_bridge=(建議使用) -torlauncher.connect=連接 +torlauncher.connect=連線 torlauncher.restart_tor=重新啟動 Tor torlauncher.quit=離開 torlauncher.quit_win=結束

1 0

[tor-launcher/master] Bump versions to 0.2.7.0.2 (translation updates only).
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit ae0cd6684b460f2602ac096814dc503116a4ed86 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 9 22:15:02 2015 +0000 Bump versions to 0.2.7.0.2 (translation updates only). --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 7c4ebf6..b78c677 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.0.1</em:version> + <em:version>0.2.7.0.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-browser-bundle/maint-4.0] Bug #13776: Incremental MAR files not reproducible
by gk＠torproject.org 09 Jan '15

09 Jan '15

commit 1fa248e28610b14a41228cd0533a8fb147c0b928 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Dec 12 11:54:40 2014 -0500 Bug #13776: Incremental MAR files not reproducible Set the locale and umask to avoid differences across systems and users when generating incremental MAR files. --- tools/update-responses/update_responses | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index c788586..b28b575 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -10,9 +10,16 @@ use Cwd; use File::Temp; use File::Find; use File::Which; +use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +# Set umask and locale to provide a consistent environment for MAR file +# generation, etc. +umask(0022); +$ENV{"LC_ALL"} = "C"; +setlocale(LC_ALL, "C"); + my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 );

1 0

[tor-browser-bundle/master] Bug 13857: allow making incrementals MARs for a specific channel
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit 0f37c120647be48614d3af9512bcc06ba295fa34 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 14:43:12 2014 +0100 Bug 13857: allow making incrementals MARs for a specific channel The gen_incrementals can now receive a channel name as argument. In that case, incremental MARs will be created for this channel only. If there is no argument, incremental MARs for all channels are created. Makefile rules have been added for the different channels. --- gitian/Makefile | 8 +++++++- gitian/README.build | 4 ++++ tools/update-responses/update_responses | 24 +++++++++++++++--------- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 9613db6..1fce05e 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,7 +33,13 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: - ../tools/update-responses/gen_incrementals + ../tools/update-responses/gen_incrementals release + +incrementals-alpha: + ../tools/update-responses/gen_incrementals alpha + +incrementals-beta: + ../tools/update-responses/gen_incrementals beta signmars: ./signmars.sh versions diff --git a/gitian/README.build b/gitian/README.build index 670e84c..dd7af91 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -78,6 +78,10 @@ Detailed Explanation of Scripts: - hash-nightly: The equivalent to the 'hash' rule for nightly packages - hash-alpha: The equivalent to the 'hash' rule for alpha packages - hash-beta: The equivalent to the 'hash' rule for beta packages + - incrementals-alpha: The equivalent to the 'incrementals' rule for + alpha packages + - incrementals-beta: The equivalent to the 'incrementals' rule for + beta packages - signmars-nightly: The equivalent to the 'signmars' rule for nightly packages - signmars-alpha: The equivalent to the 'signmars' rule for alpha packages - signmars-beta: The equivalent to the 'signmars' rule for beta packages diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 5b85037..e66b27d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -180,14 +180,6 @@ sub create_missing_incremental_mars_for_version { $pm->wait_all_children; } -sub create_all_missing_incremental_mars { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { - get_version_files($config, $version); - create_missing_incremental_mars_for_version($config, $version); - } -} - sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -195,6 +187,16 @@ sub get_config { // $config->{$name}; } +sub channel_to_version { + my ($config, @channels) = @_; + return values %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + } + return map { $config->{channels}{$_} } @channels; +} + sub get_response { my ($config, $version, $os, @patches) = @_; my $res; @@ -325,9 +327,13 @@ my %actions = ( clean_htdocs; }, gen_incrementals => sub { + my ($config) = @_; extract_martools; check_deps; - create_all_missing_incremental_mars(@_); + foreach my $version (channel_to_version($config, @ARGV)) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } }, );

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'boklm/bug13857-v2'
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit 5401e06508eae0aaa8f6357303b006dd833ba8e5 Merge: bf363a7 ca6ca42 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 8 14:28:00 2015 +0000 Merge remote-tracking branch 'boklm/bug13857-v2' gitian/Makefile | 16 +- gitian/README.build | 8 + tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/htdocs/no-update.xml | 2 - tools/update-responses/update_responses | 196 ++++++++++++++++---- 6 files changed, 189 insertions(+), 42 deletions(-)

1 0

[tor-browser-bundle/master] Add a command to check an update_responses deployement
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit ca6ca42b8a78f5dd6b0cad7db0f8416e3a419332 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 22 14:55:20 2014 +0100 Add a command to check an update_responses deployement usage: check_update_responses_deployement <base_url> [channels...] example: $ ./check_update_responses_deployement \ https://dist.torproject.org/torbrowser/update_2 release This command will read the config.yml file, then try to load different URLs to check that it returns correct xml with the expected version, incremental update files for the versions that should have them, or no update when already using the current version. It does not currently check that the checksum of the files is correct. --- tools/update-responses/README.md | 8 +- .../check_update_responses_deployement | 1 + tools/update-responses/update_responses | 106 ++++++++++++++++++++ 3 files changed, 112 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/README.md b/tools/update-responses/README.md index 206bd7a..5fe69a2 100644 --- a/tools/update-responses/README.md +++ b/tools/update-responses/README.md @@ -13,7 +13,8 @@ Dependencies The following perl modules need to be installed to run the script: FindBin YAML File::Slurp Digest::SHA XML::Writer File::Temp - IO::CaptureOutput File::Which Parallel::ForkManager + IO::CaptureOutput File::Which Parallel::ForkManager XML::LibXML + LWP On Debian / Ubuntu you can install them with: @@ -21,7 +22,8 @@ On Debian / Ubuntu you can install them with: # apt-get install libfindbin-libs-perl libyaml-perl libfile-slurp-perl \ libdigest-sha-perl libxml-writer-perl \ libio-captureoutput-perl libfile-which-perl \ - libparallel-forkmanager-perl + libparallel-forkmanager-perl libxml-libxml-perl \ + libwww-perl ``` On Red Hat / Fedora you can install them with: @@ -29,7 +31,7 @@ On Red Hat / Fedora you can install them with: ``` # for module in FindBin YAML File::Slurp Digest::SHA XML::Writer \ File::Temp IO::CaptureOutput File::Which \ - Parallel::ForkManager + Parallel::ForkManager XML::LibXML LWP do yum install "perl($module)"; done ``` diff --git a/tools/update-responses/check_update_responses_deployement b/tools/update-responses/check_update_responses_deployement new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/check_update_responses_deployement @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 0c487e3..f982637 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use feature "state"; use English; use FindBin; use YAML qw(LoadFile); @@ -15,6 +16,8 @@ use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; use File::Basename; +use XML::LibXML '1.70'; +use LWP::Simple; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -26,6 +29,7 @@ my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; +my @check_errors; sub exit_error { print STDERR "Error: ", $_[0], "\n"; @@ -327,6 +331,107 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } +sub log_step { + my ($url, $step, $status, $details) = @_; + state $u; + if (!defined $u || $url ne $u) { + print "\n" if $u; + print "$url\n"; + $u = $url; + } + print ' ', $step, $status ? ': OK' : ': ERROR', + $details ? " - $details\n" : "\n"; + return if $status; + push @check_errors, { url => $url, step => $step, details => $details }; +} + +sub get_remote_xml { + my ($url) = @_; + my $content = get $url; + log_step($url, 'get', defined $content); + return undef unless defined $content; + my $dom = eval { XML::LibXML->load_xml(string => $content) }; + log_step($url, 'parse_xml', defined $dom, $@); + return $dom; +} + +sub check_get_version { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + return $updates[0]->getAttribute('appVersion'); +} + +sub check_no_update { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return @updates == 0; +} + +sub check_has_incremental { + my ($dom) = @_; + my @updates = $dom->documentElement()->getChildrenByLocalName('update'); + return undef unless @updates; + my @patches = $updates[0]->getChildrenByLocalName('patch'); + foreach my $patch (@patches) { + return 1 if $patch->getAttribute('type') eq 'partial'; + } + return undef; +} + +sub check_update_responses_channel { + my ($config, $base_url, $channel) = @_; + my $channel_version = $config->{channels}{$channel}; + foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $lang (qw(en-US de)) { + my $url = "$base_url/$channel/$build_target/1.0/$lang"; + my $dom = get_remote_xml($url); + if ($dom) { + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + } + $url = "$base_url/$channel/$build_target/$channel_version/$lang"; + $dom = get_remote_xml($url); + log_step($url, 'no_update', check_no_update($dom)) if $dom; + my @inc = @{$config->{versions}{$channel_version}{incremental_from}} + if $config->{versions}{$channel_version}{incremental_from}; + foreach my $inc_from (@inc) { + my $url = "$base_url/$channel/$build_target/$inc_from/$lang"; + $dom = get_remote_xml($url); + next unless $dom; + my $version = check_get_version($dom); + log_step($url, 'version', $version eq $channel_version, + "expected: $channel_version received: $version"); + log_step($url, 'has_incremental', check_has_incremental($dom)); + } + } + } +} + +sub check_update_responses { + my ($config) = @_; + exit_error "usage: $PROGRAM_NAME <base_url> [channels...]" unless @ARGV; + my ($base_url, @channels) = @ARGV; + foreach my $channel (@channels ? @channels : keys %{$config->{channels}}) { + check_update_responses_channel($config, $base_url, $channel); + } + if (!@check_errors) { + print "\n\nNo errors\n"; + return; + } + print "\n\nErrors list:\n"; + my $url = ''; + foreach my $error (@check_errors) { + if ($url ne $error->{url}) { + $url = $error->{url}; + print "$url\n"; + } + print " $error->{step}", + $error->{details} ? " - $error->{details}\n" : "\n"; + } +} + my %actions = ( update_responses => sub { my ($config) = @_; @@ -349,6 +454,7 @@ my %actions = ( create_missing_incremental_mars_for_version($config, $version); } }, + check_update_responses_deployement => \&check_update_responses, ); my $action = fileparse($PROGRAM_NAME);

1 0

[tor-browser-bundle/master] Bug 13857: allow updating responses for a specific channel
by gk＠torproject.org 08 Jan '15

08 Jan '15

commit 808746222a49af4e6294dc82397932e331d2a4fd Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 8 19:19:19 2014 +0100 Bug 13857: allow updating responses for a specific channel The update_responses command can now receive a channel name as argument. In that case, only the xml responses for the selected channel(s) are updated. The files are now located in directory htdocfiles/$channel and each channel has its own .htaccess file in that directory. Makefile rules have been added to update the different channels. --- gitian/Makefile | 8 +++- gitian/README.build | 4 ++ tools/update-responses/htdocs/no-update.xml | 2 - tools/update-responses/update_responses | 66 ++++++++++++++++----------- 4 files changed, 51 insertions(+), 29 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 1fce05e..eaa22c2 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -54,7 +54,13 @@ signmars-nightly: ./signmars.sh versions.nightly update_responses: - ../tools/update-responses/update_responses + ../tools/update-responses/update_responses release + +update_responses-alpha: + ../tools/update-responses/update_responses alpha + +update_responses-beta: + ../tools/update-responses/update_responses beta hash: ./hash-bundles.sh versions diff --git a/gitian/README.build b/gitian/README.build index dd7af91..b51fd96 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -82,6 +82,10 @@ Detailed Explanation of Scripts: alpha packages - incrementals-beta: The equivalent to the 'incrementals' rule for beta packages + - update_responses-alpha: The equivalent to the 'update_responses' rule + for alpha packages + - update_responses-beta: The equivalent to the 'update_responses' rule + for beta packages - signmars-nightly: The equivalent to the 'signmars' rule for nightly packages - signmars-alpha: The equivalent to the 'signmars' rule for alpha packages - signmars-beta: The equivalent to the 'signmars' rule for beta packages diff --git a/tools/update-responses/htdocs/no-update.xml b/tools/update-responses/htdocs/no-update.xml deleted file mode 100644 index 910e99d..0000000 --- a/tools/update-responses/htdocs/no-update.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates></updates> diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index e66b27d..0c487e3 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -24,7 +24,7 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); -my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 ); +my %htdocsfiles; my $releases_dir = "$FindBin::Bin/../../gitian"; sub exit_error { @@ -46,17 +46,21 @@ sub get_nbprocs { } sub write_htdocs { - my ($file, $content) = @_; + my ($channel, $file, $content) = @_; mkdir $htdocsdir unless -d $htdocsdir; - write_file("$htdocsdir/$file", $content); - $htdocsfiles{$file} = 1; + mkdir "$htdocsdir/$channel" unless -d "$htdocsdir/$channel"; + write_file("$htdocsdir/$channel/$file", $content); + $htdocsfiles{$channel}->{$file} = 1; } sub clean_htdocs { - opendir(my $d, $htdocsdir); - my @files = grep { ! $htdocsfiles{$_} } readdir $d; - closedir $d; - unlink map { "$htdocsdir/$_" } @files; + my (@channels) = @_; + foreach my $channel (@channels) { + opendir(my $d, "$htdocsdir/$channel"); + my @files = grep { ! $htdocsfiles{$channel}->{$_} } readdir $d; + closedir $d; + unlink map { "$htdocsdir/$channel/$_" } @files; + } } sub get_sha512_hex_of_file { @@ -233,8 +237,10 @@ sub get_response { } sub write_responses { - my ($config) = @_; - foreach my $version (values %{$config->{channels}}) { + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; + foreach my $channel (@channels) { + my $version = $config->{channels}{$channel}; get_version_files($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; @@ -249,43 +255,44 @@ sub write_responses { foreach my $lang (keys %{$files->{$os}}) { my $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}); - write_htdocs("$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$version-$os-$lang.xml", $resp); foreach my $from_version (keys %{$files->{$os}{$lang}{partial}}) { $resp = get_response($config, $version, $os, $files->{$os}{$lang}{complete}, $files->{$os}{$lang}{partial}{$from_version}); - write_htdocs("$from_version-$version-$os-$lang.xml", $resp); + write_htdocs($channel, "$from_version-$version-$os-$lang.xml", $resp); } } } + write_htdocs($channel, 'no-update.xml', + '<?xml version="1.0" encoding="UTF-8"?>' + . "\n<updates></updates>\n"); } } sub write_htaccess { - my ($config) = @_; - my $htaccess = "RewriteEngine On\n"; + my ($config, @channels) = @_; + @channels = keys %{$config->{channels}} unless @channels; my $flags = "[last]"; - foreach my $channel (sort keys %{$config->{channels}}) { + foreach my $channel (@channels) { + my $htaccess = "RewriteEngine On\n"; my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; - $htaccess .= "RewriteRule " - . "^$channel/[^\/]+/$version/ " - . "no-update.xml $flags\n"; + $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); foreach my $lang (sort keys %{$files->{$os}}) { foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$channel/$bt/$from_version/$lang " + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " . "$from_version-$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt/[^\/]+/$lang " + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$channel/$bt " - . "$version-$os-en-US.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } + write_htdocs($channel, '.htaccess', $htaccess); } - write_htdocs('.htaccess', $htaccess); } sub check_deps { @@ -322,9 +329,16 @@ sub extract_martools { my %actions = ( update_responses => sub { - write_responses(@_); - write_htaccess(@_); - clean_htdocs; + my ($config) = @_; + my @channels = @ARGV ? @ARGV : keys %{$config->{channels}}; + foreach my $channel (@channels) { + exit_error "Unknown channel $channel" + unless $config->{channels}{$channel}; + $htdocsfiles{$channel} = { '.' => 1, '..' => 1 }; + } + write_responses($config, @channels); + write_htaccess($config, @channels); + clean_htdocs(@channels); }, gen_incrementals => sub { my ($config) = @_;

1 0

[torbutton/master] Bug 13835: Add support for TOR_DEFAULT_HOMEPAGE env variable.
by brade＠torproject.org 07 Jan '15

07 Jan '15

commit a8b1333f08cd79699bec0d3d9a74845487c9a8be Author: linostar <linux.anas(a)gmail.com> Date: Tue Jan 6 17:33:39 2015 +0200 Bug 13835: Add support for TOR_DEFAULT_HOMEPAGE env variable. If TOR_DEFAULT_HOMEPAGE is set and the user has not customized the browser home page, it is reset to the value contained in TOR_DEFAULT_HOMEPAGE. --- src/components/startup-observer.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index d7b7bcd..de39e64 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -38,6 +38,16 @@ function StartupObserver() { getService(Ci.nsIObserverService); observerService.addObserver(this, "quit-application-granted", false); + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + var prefName = "browser.startup.homepage"; + if (env.exists("TOR_DEFAULT_HOMEPAGE")) { + // if the user has set this value in a previous installation, don't override it + if (!this._prefs.prefHasUserValue(prefName)) { + this._prefs.setCharPref(prefName, env.get("TOR_DEFAULT_HOMEPAGE")); + } + } + try { var test = this._prefs.getCharPref("torbrowser.version"); this.is_tbb = true;

1 0

[tor-browser-bundle/master] Update a comment.
by gk＠torproject.org 06 Jan '15

06 Jan '15

commit bf363a746eeb3a5e7243f573a5ffeda93a31aa9f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 18:12:28 2015 -0800 Update a comment. The meek-http-helper profile now has a proxy set even if it somehow starts up without extensions. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index eb94d1d..72bbb9b 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -10,7 +10,7 @@ user_pref("browser.dom.window.dump.enabled", true); user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a -// safe-mode browser that has extensions disabled and no proxy. +// safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1);

1 0

[tor-browser-bundle/maint-4.0] Update a comment.
by gk＠torproject.org 06 Jan '15

06 Jan '15

commit 8df1fb275aa6427f4af9c683e06d4ad4c0c07727 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 5 18:12:28 2015 -0800 Update a comment. The meek-http-helper profile now has a proxy set even if it somehow starts up without extensions. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index eb94d1d..72bbb9b 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -10,7 +10,7 @@ user_pref("browser.dom.window.dump.enabled", true); user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a -// safe-mode browser that has extensions disabled and no proxy. +// safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1);

1 0

[tor-browser-bundle/maint-4.0] Upgrade meek to 0.15.
by gk＠torproject.org 05 Jan '15

05 Jan '15

commit f256d6c751a7c51dfa511dcf18babe1b3f792577 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 27 17:24:15 2014 +0000 Upgrade meek to 0.15. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 6f9d97b..a8c9475 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index e17b071..b970b51 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.beta b/gitian/versions.beta index 29ba9e9..8aa5ea1 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-browser-bundle/master] Upgrade meek to 0.15.
by gk＠torproject.org 05 Jan '15

05 Jan '15

commit e8b710e8688b29e2850e38e72583713adf65c92a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Dec 27 17:24:15 2014 +0000 Upgrade meek to 0.15. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index b6ec79f..d2d6e17 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 4e6cead..2e1efeb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.beta b/gitian/versions.beta index 29ba9e9..8aa5ea1 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.11 +MEEK_TAG=0.15 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-browser-bundle/master] Updating the README.build.
by gk＠torproject.org 19 Dec '14

19 Dec '14

commit fa3ac404e97e5dcb25e31e9ec7dfddf229714d22 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 19 10:38:33 2014 +0000 Updating the README.build. This update takes account of the changes landed in #13379 and earlier updater related bugs. It removes the section with spurious hangs during builds as the underlying libfaketime problems should be fixed with the switch to a newer libfaketime providing a more fine-grained control via FAKETIME_SKIP_CMDS and friends. --- gitian/README.build | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 24a67a8..670e84c 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -46,15 +46,19 @@ Detailed Explanation of Scripts: several helper scripts to make things easier. 0. Makefile: The main Makefile. It has the following commands: + - all: The default. It calls the 'clean', 'prep' and 'build' rules - prep: Check OS prerequisites and download source dependency inputs - build: Build localized bundles for Linux, Windows, and Mac - clean: Remove prior partial build stages (see 'Partial Rebuilds' below for the usage of clean-* commands) - vmclean: Remove VM base images - - distclean: Remove source dependency inputs, and run clean and vmclean - - all: The default. It calls clean, prep, and then build. - - sign: Signs your build output and uploads it to people.torproject.org - - match: Checks your build output against public signed hashes + - distclean: Remove source dependency inputs, and run 'clean' and 'vmclean' + - sign: Sign your build output and uploads it to people.torproject.org + - match: Check your build output against public signed hashes + - hash: Create the SHA256 sums + - incrementals: Create the incremental update (.mar) files + - update_responses: Create .xml and .htaccess files for the updater + - signmars: Create the signatures for the update (.mar) files To build beta/alpha/nightly bundles, alternate targets are provided: - nightly: The equivalent to the 'all' rule for nightly packages - alpha: The equivalent to the 'all' rule for alpha packages @@ -71,6 +75,12 @@ Detailed Explanation of Scripts: - match-nightly: The equivalent to the 'match' rule for nightly packages - match-alpha: The equivalent to the 'match' rule for alpha packages - match-beta: The equivalent to the 'match' rule for beta packages + - hash-nightly: The equivalent to the 'hash' rule for nightly packages + - hash-alpha: The equivalent to the 'hash' rule for alpha packages + - hash-beta: The equivalent to the 'hash' rule for beta packages + - signmars-nightly: The equivalent to the 'signmars' rule for nightly packages + - signmars-alpha: The equivalent to the 'signmars' rule for alpha packages + - signmars-beta: The equivalent to the 'signmars' rule for beta packages 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. @@ -119,7 +129,13 @@ Detailed Explanation of Scripts: 12. upload-signature.sh: This script signs and uploads your 'sha256sums.txt' file (for use if you are an official builder). - + 13. signmars.sh: This script generates the signatures on the update (.mar) + files. It expects an nssdb directory, containing the key, in the same + directory (i.e. tor-browser-bundle/gitian where it is located, too) and + a certificate with "marsigner" as nickname. Both the default nssdb + directory and the default certificate nickname can get overwritten by + exporting 'NSS_DB_DIR' and 'NSS_CERTNAME' pointing to the directory and + the nickname to be used instead. Partial Rebuilds: @@ -174,22 +190,14 @@ Known Issues and Quirks: creation hangs in the future (or help us write a wrapper script that tests VMs and re-runs the VM creation step if they don't boot). - 2. One out of every 50 builds or so, 'make' locks up at some point during a - build, probably due to timestamp issues inside the Gitian VM. The - symptoms of this are a hung build where the VM or LXC container processes - are consuming no CPU. - - Simply re-running 'make build' will resume the appropriate bundle - component for you. - - 3. If you use git branches for any repos instead of tags (for example, for + 2. If you use git branches for any repos instead of tags (for example, for a development or nightly build), fresh commits will need to be merged manually (or better git-fu is needed in ./fetch-inputs.sh, as it is currently meant to deal with tags only). - 4. Running more than one instance of Gitian at a time is not supported. + 3. Running more than one instance of Gitian at a time is not supported. - 5. Related: If you perform a fresh Gitian checkout for purposes of + 4. Related: If you perform a fresh Gitian checkout for purposes of verification, be sure to kill any stray qemu VM processes before starting the new build (because the new Gitian checkout will not have the PID or SSH keys of the previous instances' VM, and VM startup will either hang

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 13379: Adding our MAR signing keys.
by gk＠torproject.org 18 Dec '14

18 Dec '14

commit e1fdf99b8cf2d98e13ef5fa112935f96614d6af5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 18 13:25:44 2014 +0000 Bug 13379: Adding our MAR signing keys. --- toolkit/mozapps/update/updater/release_primary.der | Bin 709 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 713 -> 1233 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 11417c3..542fb24 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index 16a7ef6..334fad8 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser-bundle/master] Bug 13379: Sign our MAR files.
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit d852329ac0979d8005e9e8bdd9b3f8a049fc2db4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 17 16:57:28 2014 -0500 Bug 13379: Sign our MAR files. In the Linux mar-tools package, include certutil, signmar, and the required NSS and NSPR libraries. Change update_responses to select the action to be done based on the program name, thereby separating the incremental MAR file generation (done via a new 'gen_incrementals' symlink) from the htdocs generation. Also added an 'update_responses' make target. Thanks to boklm for help with this. Add a series of 'signmar' make targets which run a new signmars.sh script, which does the following: 1. Prompts for an NSS password (the script assumes that an nssdb directory exists that contains the signing key/cert). 2. Moves original (unsigned) MAR files to a TORBROWSER_VERSION-unsigned/ directory. 3. Signs each of the MAR files, placing the signed files in the TORBROWSER_VERSION/ directory. You may set NSS_DB_DIR and/or NSS_CERTNAME before running signmars.sh; the defaults are ./nssdb and marsigner --- gitian/Makefile | 15 +++ gitian/descriptors/linux/gitian-firefox.yml | 11 +++ gitian/signmars.sh | 135 +++++++++++++++++++++++++++ tools/update-responses/gen_incrementals | 1 + tools/update-responses/update_responses | 34 +++++-- 5 files changed, 189 insertions(+), 7 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 2c17656..9613db6 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -33,6 +33,21 @@ build-beta: ./hash-bundles.sh versions.beta incrementals: + ../tools/update-responses/gen_incrementals + +signmars: + ./signmars.sh versions + +signmars-alpha: + ./signmars.sh versions.alpha + +signmars-beta: + ./signmars.sh versions.beta + +signmars-nightly: + ./signmars.sh versions.nightly + +update_responses: ../tools/update-responses/update_responses hash: diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 5f96b6e..a1abf2e 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -136,12 +136,23 @@ script: | rm -f $INSTDIR/Browser/*.chk # # Make MAR-based update tools available for use during the bundle phase. + # Note that mar and mbsdiff are standalone tools, compiled for the build + # host's architecture. We also include signmar, certutil, and the libraries + # they require; these utilities and libraries are built for the target + # architecture. MARTOOLS=~/build/mar-tools mkdir -p $MARTOOLS cp -p config/createprecomplete.py $MARTOOLS/ cp -p tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ + cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ + cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ + NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" + NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + for LIB in $NSS_LIBS $NSPR_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done cd ~/build zip -r mar-tools-linux${GBUILD_BITS}.zip mar-tools cp -p mar-tools-linux${GBUILD_BITS}.zip $OUTDIR/ diff --git a/gitian/signmars.sh b/gitian/signmars.sh new file mode 100755 index 0000000..fdb531e --- /dev/null +++ b/gitian/signmars.sh @@ -0,0 +1,135 @@ +#!/bin/bash +# +# +# You may set NSS_DB_DIR and/or NSS_CERTNAME before invoking this script. + +set -e +set -u + +WRAPPER_DIR=$(dirname "$0") +WRAPPER_DIR=$(readlink -e "$WRAPPER_DIR") + +if [ -z "${NSS_DB_DIR+x}" ]; then + NSS_DB_DIR=$WRAPPER_DIR/nssdb +fi + +if [ -z "${NSS_CERTNAME+x}" ]; then + NSS_CERTNAME=marsigner +fi + +# Incorporate definitions from the versions file. +if [ -z "$1" ]; then + VERSIONS_FILE=$WRAPPER_DIR/versions +else + VERSIONS_FILE=$1 +fi + +if ! [ -e $VERSIONS_FILE ]; then + echo >&2 "Error: $VERSIONS_FILE file does not exist" + exit 1 +fi + +. $VERSIONS_FILE + +export LC_ALL=C + +# Check some prerequisites. +if [ ! -r "$NSS_DB_DIR/cert8.db" ]; then + >&2 echo "Please create and populate the $NSS_DB_DIR directory" + exit 2 +fi + +OSNAME="" +ARCH="$(uname -s)-$(uname -m)" +case $ARCH in + Linux-x86_64) + OSNAME="linux64" + ;; + Linux-i*86) + OSNAME="linux32" + ;; + *) + >&2 echo "Unsupported architecture $ARCH" + exit 2 +esac + +# Extract the MAR tools so we can use the signmar program. +MARTOOLS_TMP_DIR=$(mktemp -d) +trap "rm -rf $MARTOOLS_TMP_DIR" EXIT +MARTOOLS_ZIP="$WRAPPER_DIR/../../gitian-builder/inputs/mar-tools-${OSNAME}.zip" +cd $MARTOOLS_TMP_DIR +unzip -q "$MARTOOLS_ZIP" +cd $WRAPPER_DIR +export PATH="$MARTOOLS_TMP_DIR/mar-tools:$PATH" +if [ -z "${LD_LIBRARY_PATH+x}" ]; then + export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools" +else + export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools:$LD_LIBRARY_PATH" +fi + +# Prompt for the NSS password. +# TODO: Test that the entered NSS password is correct. But how? Unfortunately, +# both certutil and signmar keep trying to read a new password when they are +# given an incorrect one. +read -s -p "NSS password:" NSSPASS +echo "" + +# Sign each MAR file. +# +# Our strategy is to first move all .mar files out of the TORBROWSER_VERSION +# directory into a TORBROWSER_VERSION-unsigned/ directory. Details: +# If a file has not been signed, we move it to the -unsigned/ directory. +# If a file has already been signed and a file with the same name exists in +# the -unsigned/ directory, we just delete the signed file. +# If a file has already been signed but no corresponding file exists in +# the -unsigned/ directory, we report an error and exit. +# +# Once the above is done, the -unsigned/ directory contains a set of .mar +# files that need to be signed, so we go ahead and sign them one-by-one. +SIGNED_DIR="$WRAPPER_DIR/$TORBROWSER_VERSION" +UNSIGNED_DIR="$WRAPPER_DIR/${TORBROWSER_VERSION}-unsigned" +mkdir -p "$UNSIGNED_DIR" +cd "$SIGNED_DIR" +for marfile in *.mar; do + if [ ! -f "$marfile" ]; then + continue; + fi + + # First, we check for an existing signature. The signmar -T output will + # include a line like "Signature block found with N signatures". + SIGINFO_PREFIX="Signature block found with " + SIGINFO=$(signmar -T "$marfile" | grep "^${SIGINFO_PREFIX}") + SIGCOUNT=0 + if [ ! -z "$SIGINFO" ]; then + SIGCOUNT=$(echo $SIGINFO | sed -e "s/${SIGINFO_PREFIX}//" -e 's/$[0-9]*$.*$/\1/') + fi + if [ $SIGCOUNT -eq 0 ]; then + # No signature; move this .mar file to the -unsigned/ directory. + mv "$marfile" "$UNSIGNED_DIR/" + elif [ -e "$UNSIGNED_DIR/$marfile" ]; then + # We have an -unsigned/ copy; discard this file. + rm "$marfile" + else + >&2 echo "Error: $SIGNED_DIR/$marfile is already signed but $UNSIGNED_DIR/$marfile is missing" + # TODO: Try to remove the existing signature(s) from marfile? + exit 1 + fi +done + +# Use signmar to sign each .mar file that is now in the -unsigned directory. +TMPMAR="$SIGNED_DIR/tmp.mar" +trap "rm -f $TMPMAR" EXIT +cd "$UNSIGNED_DIR" +COUNT=0 +for marfile in *.mar; do + if [ ! -f "$marfile" ]; then + continue; + fi + echo "$NSSPASS" | signmar -d "$NSS_DB_DIR" -n "$NSS_CERTNAME" -s \ + "$marfile" "$TMPMAR" + mv "$TMPMAR" "$SIGNED_DIR/$marfile" + COUNT=$((COUNT + 1)) +done + +echo "The $COUNT MAR files located in $SIGNED_DIR/ have been signed." +echo "The unsigned (original) MAR files are in $UNSIGNED_DIR/" diff --git a/tools/update-responses/gen_incrementals b/tools/update-responses/gen_incrementals new file mode 120000 index 0000000..3766925 --- /dev/null +++ b/tools/update-responses/gen_incrementals @@ -0,0 +1 @@ +update_responses \ No newline at end of file diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index b28b575..5b85037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use strict; +use English; use FindBin; use YAML qw(LoadFile); use File::Slurp; @@ -13,6 +14,7 @@ use File::Which; use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +use File::Basename; # Set umask and locale to provide a consistent environment for MAR file # generation, etc. @@ -158,7 +160,7 @@ sub create_incremental_mar { $pm->finish; } -sub create_missing_incremental_mars { +sub create_missing_incremental_mars_for_version { my ($config, $version) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); @@ -178,6 +180,14 @@ sub create_missing_incremental_mars { $pm->wait_all_children; } +sub create_all_missing_incremental_mars { + my ($config) = @_; + foreach my $version (values %{$config->{channels}}) { + get_version_files($config, $version); + create_missing_incremental_mars_for_version($config, $version); + } +} + sub get_config { my ($config, $version, $os, $name) = @_; return $config->{versions}{$version}{$os}{$name} @@ -224,7 +234,6 @@ sub write_responses { my ($config) = @_; foreach my $version (values %{$config->{channels}}) { get_version_files($config, $version); - create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; foreach my $old_os (keys %$migrate_archs) { @@ -309,8 +318,19 @@ sub extract_martools { $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; } -extract_martools; -check_deps; -write_responses($config); -write_htaccess($config); -clean_htdocs; +my %actions = ( + update_responses => sub { + write_responses(@_); + write_htaccess(@_); + clean_htdocs; + }, + gen_incrementals => sub { + extract_martools; + check_deps; + create_all_missing_incremental_mars(@_); + }, +); + +my $action = fileparse($PROGRAM_NAME); +exit_error "Unknown action $action" unless $actions{$action}; +$actions{$action}->($config);

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 13379: Sign our MAR files (backport Mozilla patches).
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit 40b509e6d7408a73c5a81a3d971dfc6daf5f7510 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Nov 14 11:24:14 2014 -0500 Bug 13379: Sign our MAR files (backport Mozilla patches). Backport reviewed patches from these two Mozilla bugs: 903135 - Link updater to NSS and enable MAR verification on Linux and OSX 903126 - Implement a platform independent way to determine which cert to use for verifying mars Configure browser build with --enable-signmar and --enable-verify-mar. --- browser/confvars.sh | 5 + configure.in | 6 +- modules/libmar/moz.build | 6 +- modules/libmar/src/mar.h | 30 ++++- modules/libmar/src/mar_cmdline.h | 32 ----- modules/libmar/tool/mar.c | 109 +++++++++-------- modules/libmar/verify/cryptox.c | 32 ++--- modules/libmar/verify/cryptox.h | 29 ++--- modules/libmar/verify/mar_verify.c | 143 +++++++--------------- toolkit/mozapps/update/updater/Makefile.in | 12 +- toolkit/mozapps/update/updater/archivereader.cpp | 29 +---- toolkit/mozapps/update/updater/updater.cpp | 19 +++ 12 files changed, 197 insertions(+), 255 deletions(-) diff --git a/browser/confvars.sh b/browser/confvars.sh index 8914379..8e7cf7e 100644 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -8,6 +8,11 @@ MOZ_APP_VENDOR=Mozilla MOZ_UPDATER=1 MOZ_PHOENIX=1 +MOZ_VERIFY_MAR_SIGNATURE=1 + +# Enable building ./signmar and running libmar signature tests +MOZ_ENABLE_SIGNMAR=1 + MOZ_CHROME_FILE_FORMAT=omni MOZ_DISABLE_EXPORT_JS=1 MOZ_SAFE_BROWSING=1 diff --git a/configure.in b/configure.in index b97a1e6..3093a3f 100644 --- a/configure.in +++ b/configure.in @@ -6351,11 +6351,7 @@ MOZ_ARG_ENABLE_BOOL(verify-mar, MOZ_VERIFY_MAR_SIGNATURE= ) if test -n "$MOZ_VERIFY_MAR_SIGNATURE"; then - if test "$OS_ARCH" = "WINNT"; then - AC_DEFINE(MOZ_VERIFY_MAR_SIGNATURE) - else - AC_MSG_ERROR([Can only build with --enable-verify-mar with a Windows target]) - fi + AC_DEFINE(MOZ_VERIFY_MAR_SIGNATURE) fi dnl ======================================================== diff --git a/modules/libmar/moz.build b/modules/libmar/moz.build index 44191c3..d9a8b34 100644 --- a/modules/libmar/moz.build +++ b/modules/libmar/moz.build @@ -9,11 +9,7 @@ DIRS += ['src'] if CONFIG['MOZ_ENABLE_SIGNMAR']: DIRS += ['sign', 'verify'] TEST_DIRS += ['tests'] -elif CONFIG['OS_ARCH'] == 'WINNT': - # On Windows we don't verify with NSS and updater needs to link to it - DIRS += ['verify'] -elif CONFIG['OS_ARCH'] == 'Darwin': - # On OSX we don't verify with NSS and updater needs to link to it. +elif CONFIG['MOZ_VERIFY_MAR_SIGNATURE']: DIRS += ['verify'] # If we are building ./sign and ./verify then ./tool must come after it diff --git a/modules/libmar/src/mar.h b/modules/libmar/src/mar.h index 4e53d2c..98b454d 100644 --- a/modules/libmar/src/mar.h +++ b/modules/libmar/src/mar.h @@ -134,6 +134,26 @@ int mar_create(const char *dest, */ int mar_extract(const char *path); +#define MAR_MAX_CERT_SIZE (16*1024) // Way larger than necessary + +/* Read the entire file (not a MAR file) into a newly-allocated buffer. + * This function does not write to stderr. Instead, the caller should + * write whatever error messages it sees fit. The caller must free the returned + * buffer using free(). + * + * @param filePath The path to the file that should be read. + * @param maxSize The maximum valid file size. + * @param data On success, *data will point to a newly-allocated buffer + * with the file's contents in it. + * @param size On success, *size will be the size of the created buffer. + * + * @return 0 on success, -1 on error + */ +int mar_read_entire_file(const char * filePath, + uint32_t maxSize, + /*out*/ const uint8_t * *data, + /*out*/ uint32_t *size); + /** * Verifies a MAR file by verifying each signature with the corresponding * certificate. That is, the first signature will be verified using the first @@ -154,12 +174,10 @@ int mar_extract(const char *path); * a negative number if there was an error * a positive number if the signature does not verify */ -#ifdef XP_WIN -int mar_verify_signaturesW(MarFile *mar, - const uint8_t * const *certData, - const uint32_t *certDataSizes, - uint32_t certCount); -#endif +int mar_verify_signatures(MarFile *mar, + const uint8_t * const *certData, + const uint32_t *certDataSizes, + uint32_t certCount); /** * Reads the product info block from the MAR file's additional block section. diff --git a/modules/libmar/src/mar_cmdline.h b/modules/libmar/src/mar_cmdline.h index e8645ec..e2c9ed5 100644 --- a/modules/libmar/src/mar_cmdline.h +++ b/modules/libmar/src/mar_cmdline.h @@ -38,38 +38,6 @@ int get_mar_file_info(const char *path, uint32_t *offsetAdditionalBlocks, uint32_t *numAdditionalBlocks); -/** - * Verifies a MAR file by verifying each signature with the corresponding - * certificate. That is, the first signature will be verified using the first - * certificate given, the second signature will be verified using the second - * certificate given, etc. The signature count must exactly match the number of - * certificates given, and all signature verifications must succeed. - * This is only used by the signmar program when used with arguments to verify - * a MAR. This should not be used to verify a MAR that will be extracted in the - * same operation by updater code. This function prints the error message if - * verification fails. - * - * @param pathToMAR The path of the MAR file whose signature should be - * checked - * @param certData Pointer to the first element in an array of certificate - * file data. - * @param certDataSizes Pointer to the first element in an array for size of - * the cert data. - * @param certNames Pointer to the first element in an array of certificate - * names. - * Used only if compiled with NSS support - * @param certCount The number of elements in certData, certDataSizes, - * and certNames - * @return 0 on success - * a negative number if there was an error - * a positive number if the signature does not verify - */ -int mar_verify_signatures(const char *pathToMAR, - const uint8_t * const *certData, - const uint32_t *certDataSizes, - const char * const *certNames, - uint32_t certCount); - /** * Reads the product info block from the MAR file's additional block section. * The caller is responsible for freeing the fields in infoBlock diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c index 8abbac7..821813c 100644 --- a/modules/libmar/tool/mar.c +++ b/modules/libmar/tool/mar.c @@ -19,6 +19,8 @@ #endif #if !defined(NO_SIGN_VERIFY) && (!defined(XP_WIN) || defined(MAR_NSS)) +#include "cert.h" +#include "pk11pub.h" int NSSInitCryptoContext(const char *NSSConfigDir); #endif @@ -120,15 +122,13 @@ int main(int argc, char **argv) { uint32_t certCount = 0; int32_t sigIndex = -1; -#if defined(XP_WIN) && !defined(MAR_NSS) && !defined(NO_SIGN_VERIFY) - HANDLE certFile; - uint8_t *certBuffers[MAX_SIGNATURES]; -#endif -#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \ - defined(XP_MACOSX)) - char* DERFilePaths[MAX_SIGNATURES]; +#if !defined(NO_SIGN_VERIFY) uint32_t fileSizes[MAX_SIGNATURES]; - uint32_t read; + uint8_t* certBuffers[MAX_SIGNATURES]; + char* DERFilePaths[MAX_SIGNATURES]; +#if (!defined(XP_WIN) && !defined(XP_MACOSX)) || defined(MAR_NSS) + CERTCertificate* certs[MAX_SIGNATURES]; +#endif #endif memset(certNames, 0, sizeof(certNames)); @@ -319,43 +319,68 @@ int main(int argc, char **argv) { return import_signature(argv[2], sigIndex, argv[3], argv[4]); case 'v': - -#if defined(XP_WIN) && !defined(MAR_NSS) if (certCount == 0) { print_usage(); return -1; } +#if (!defined(XP_WIN) && !defined(XP_MACOSX)) || defined(MAR_NSS) + if (!NSSConfigDir || certCount == 0) { + print_usage(); + return -1; + } + + if (NSSInitCryptoContext(NSSConfigDir)) { + fprintf(stderr, "ERROR: Could not initialize crypto library.\n"); + return -1; + } +#endif + + rv = 0; for (k = 0; k < certCount; ++k) { - /* If the mar program was built using CryptoAPI, then read in the buffer - containing the cert from disk. */ - certFile = CreateFileA(DERFilePaths[k], GENERIC_READ, - FILE_SHARE_READ | - FILE_SHARE_WRITE | - FILE_SHARE_DELETE, - NULL, - OPEN_EXISTING, - 0, NULL); - if (INVALID_HANDLE_VALUE == certFile) { - return -1; +#if (defined(XP_WIN) || defined(XP_MACOSX)) && !defined(MAR_NSS) + rv = mar_read_entire_file(DERFilePaths[k], MAR_MAX_CERT_SIZE, + &certBuffers[k], &fileSizes[k]); +#else + /* It is somewhat circuitous to look up a CERTCertificate and then pass + * in its DER encoding just so we can later re-create that + * CERTCertificate to extract the public key out of it. However, by doing + * things this way, we maximize the reuse of the mar_verify_signatures + * function and also we keep the control flow as similar as possible + * between programs and operating systems, at least for the functions + * that are critically important to security. + */ + certs[k] = PK11_FindCertFromNickname(certNames[k], NULL); + if (certs[k]) { + certBuffers[k] = certs[k]->derCert.data; + fileSizes[k] = certs[k]->derCert.len; + } else { + rv = -1; } - fileSizes[k] = GetFileSize(certFile, NULL); - certBuffers[k] = malloc(fileSizes[k]); - if (!ReadFile(certFile, certBuffers[k], fileSizes[k], &read, NULL) || - fileSizes[k] != read) { - CloseHandle(certFile); - for (i = 0; i <= k; i++) { - free(certBuffers[i]); - } - return -1; +#endif + if (rv) { + fprintf(stderr, "ERROR: could not read file %s", DERFilePaths[k]); + break; } - CloseHandle(certFile); } - rv = mar_verify_signatures(argv[2], certBuffers, fileSizes, - NULL, certCount); + if (!rv) { + MarFile *mar = mar_open(argv[2]); + if (mar) { + rv = mar_verify_signatures(mar, certBuffers, fileSizes, certCount); + mar_close(mar); + } else { + fprintf(stderr, "ERROR: Could not open MAR file.\n"); + rv = -1; + } + } for (k = 0; k < certCount; ++k) { +#if (defined(XP_WIN) || defined(XP_MACOSX)) && !defined(MAR_NSS) free(certBuffers[k]); +#else + /* certBuffers[k] is owned by certs[k] so don't free it */ + CERT_DestroyCertificate(certs[k]); +#endif } if (rv) { /* Determine if the source MAR file has the new fields for signing */ @@ -369,26 +394,8 @@ int main(int argc, char **argv) { } return -1; } - return 0; -#elif defined(XP_MACOSX) - return mar_verify_signatures(argv[2], (const uint8_t* const*)DERFilePaths, - 0, NULL, certCount); -#else - if (!NSSConfigDir || certCount == 0) { - print_usage(); - return -1; - } - - if (NSSInitCryptoContext(NSSConfigDir)) { - fprintf(stderr, "ERROR: Could not initialize crypto library.\n"); - return -1; - } - - return mar_verify_signatures(argv[2], NULL, 0, certNames, certCount); - -#endif /* defined(XP_WIN) && !defined(MAR_NSS) */ case 's': if (!NSSConfigDir || certCount == 0 || argc < 4) { print_usage(); diff --git a/modules/libmar/verify/cryptox.c b/modules/libmar/verify/cryptox.c index 48fbecd..af34210 100644 --- a/modules/libmar/verify/cryptox.c +++ b/modules/libmar/verify/cryptox.c @@ -16,29 +16,32 @@ /** * Loads the public key for the specified cert name from the NSS store. * - * @param certName The cert name to find. + * @param certData The DER-encoded X509 certificate to extract the key from. + * @param certDataSize The size of certData. * @param publicKey Out parameter for the public key to use. - * @param cert Out parameter for the certificate to use. * @return CryptoX_Success on success, CryptoX_Error on error. */ CryptoX_Result -NSS_LoadPublicKey(const char *certNickname, - SECKEYPublicKey **publicKey, - CERTCertificate **cert) +NSS_LoadPublicKey(const unsigned char *certData, unsigned int certDataSize, + SECKEYPublicKey **publicKey) { - secuPWData pwdata = { PW_NONE, 0 }; - if (!cert || !publicKey || !cert) { + CERTCertificate * cert; + SECItem certDataItem = { siBuffer, (unsigned char*) certData, certDataSize }; + + if (!certData || !publicKey) { return CryptoX_Error; } + cert = CERT_NewTempCertificate(CERT_GetDefaultCertDB(), &certDataItem, NULL, + PR_FALSE, PR_TRUE); /* Get the cert and embedded public key out of the database */ - *cert = PK11_FindCertFromNickname(certNickname, &pwdata); - if (!*cert) { + if (!cert) { return CryptoX_Error; } - *publicKey = CERT_ExtractPublicKey(*cert); + *publicKey = CERT_ExtractPublicKey(cert); + CERT_DestroyCertificate(cert); + if (!*publicKey) { - CERT_DestroyCertificate(*cert); return CryptoX_Error; } return CryptoX_Success; @@ -150,12 +153,11 @@ CryptoX_Result CryptoAPI_LoadPublicKey(HCRYPTPROV provider, BYTE *certData, DWORD sizeOfCertData, - HCRYPTKEY *publicKey, - HCERTSTORE *certStore) + HCRYPTKEY *publicKey) { CRYPT_DATA_BLOB blob; CERT_CONTEXT *context; - if (!provider || !certData || !publicKey || !certStore) { + if (!provider || !certData || !publicKey) { return CryptoX_Error; } @@ -165,7 +167,7 @@ CryptoAPI_LoadPublicKey(HCRYPTPROV provider, CERT_QUERY_CONTENT_FLAG_CERT, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, - certStore, NULL, (const void **)&context)) { + NULL, NULL, (const void **)&context)) { return CryptoX_Error; } diff --git a/modules/libmar/verify/cryptox.h b/modules/libmar/verify/cryptox.h index 2dd93ef..ec8f5ac 100644 --- a/modules/libmar/verify/cryptox.h +++ b/modules/libmar/verify/cryptox.h @@ -15,7 +15,9 @@ #if defined(MAR_NSS) -#include "nss_secutil.h" +#include "cert.h" +#include "keyhi.h" +#include "cryptohi.h" #define CryptoX_InvalidHandleValue NULL #define CryptoX_ProviderHandle void* @@ -26,9 +28,9 @@ #ifdef __cplusplus extern "C" { #endif -CryptoX_Result NSS_LoadPublicKey(const char *certNickname, - SECKEYPublicKey **publicKey, - CERTCertificate **cert); +CryptoX_Result NSS_LoadPublicKey(const unsigned char* certData, + unsigned int certDataSize, + SECKEYPublicKey** publicKey); CryptoX_Result NSS_VerifyBegin(VFYContext **ctx, SECKEYPublicKey * const *publicKey); CryptoX_Result NSS_VerifySignature(VFYContext * const *ctx , @@ -46,9 +48,8 @@ CryptoX_Result NSS_VerifySignature(VFYContext * const *ctx , VFY_DestroyContext(*SignatureHandle, PR_TRUE) #define CryptoX_VerifyUpdate(SignatureHandle, buf, len) \ VFY_Update(*SignatureHandle, (const unsigned char*)(buf), len) -#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, \ - publicKey, certName, cert) \ - NSS_LoadPublicKey(certName, publicKey, cert) +#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, publicKey) \ + NSS_LoadPublicKey(certData, dataSize, publicKey) #define CryptoX_VerifySignature(hash, publicKey, signedData, len) \ NSS_VerifySignature(hash, (const unsigned char *)(signedData), len) #define CryptoX_FreePublicKey(key) \ @@ -91,7 +92,7 @@ void CryptoMac_FreePublicKey(CryptoX_PublicKey* aPublicKey); #define CryptoX_VerifyUpdate(aInputData, aBuf, aLen) \ CryptoMac_VerifyUpdate(aInputData, aBuf, aLen) #define CryptoX_LoadPublicKey(aProviderHandle, aCertData, aDataSize, \ - aPublicKey, aCertName, aCert) \ + aPublicKey) \ CryptoMac_LoadPublicKey(aCertData, aPublicKey) #define CryptoX_VerifySignature(aInputData, aPublicKey, aSignature, \ aSignatureLen) \ @@ -111,8 +112,7 @@ CryptoX_Result CryptoAPI_InitCryptoContext(HCRYPTPROV *provider); CryptoX_Result CryptoAPI_LoadPublicKey(HCRYPTPROV hProv, BYTE *certData, DWORD sizeOfCertData, - HCRYPTKEY *publicKey, - HCERTSTORE *cert); + HCRYPTKEY *publicKey); CryptoX_Result CryptoAPI_VerifyBegin(HCRYPTPROV provider, HCRYPTHASH* hash); CryptoX_Result CryptoAPI_VerifyUpdate(HCRYPTHASH* hash, BYTE *buf, DWORD len); @@ -133,10 +133,8 @@ CryptoX_Result CyprtoAPI_VerifySignature(HCRYPTHASH *hash, #define CryptoX_FreeSignatureHandle(SignatureHandle) #define CryptoX_VerifyUpdate(SignatureHandle, buf, len) \ CryptoAPI_VerifyUpdate(SignatureHandle, (BYTE *)(buf), len) -#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, \ - publicKey, certName, cert) \ - CryptoAPI_LoadPublicKey(CryptoHandle, (BYTE*)(certData), \ - dataSize, publicKey, cert) +#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, publicKey) \ + CryptoAPI_LoadPublicKey(CryptoHandle, (BYTE*)(certData), dataSize, publicKey) #define CryptoX_VerifySignature(hash, publicKey, signedData, len) \ CyprtoAPI_VerifySignature(hash, publicKey, signedData, len) #define CryptoX_FreePublicKey(key) \ @@ -163,8 +161,7 @@ CryptoX_Result CyprtoAPI_VerifySignature(HCRYPTHASH *hash, CryptoX_Error #define CryptoX_FreeSignatureHandle(SignatureHandle) #define CryptoX_VerifyUpdate(SignatureHandle, buf, len) CryptoX_Error -#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, \ - publicKey, certName, cert) \ +#define CryptoX_LoadPublicKey(CryptoHandle, certData, dataSize, publicKey) \ CryptoX_Error #define CryptoX_VerifySignature(hash, publicKey, signedData, len) CryptoX_Error #define CryptoX_FreePublicKey(key) CryptoX_Error diff --git a/modules/libmar/verify/mar_verify.c b/modules/libmar/verify/mar_verify.c index 7578b62..165a802 100644 --- a/modules/libmar/verify/mar_verify.c +++ b/modules/libmar/verify/mar_verify.c @@ -17,6 +17,46 @@ #include "mar.h" #include "cryptox.h" +int +mar_read_entire_file(const char * filePath, uint32_t maxSize, + /*out*/ const uint8_t * *data, + /*out*/ uint32_t *size) +{ + int result; + FILE * f; + + if (!filePath || !data || !size) { + return -1; + } + + f = fopen(filePath, "rb"); + if (!f) { + return -1; + } + + result = -1; + if (!fseeko(f, 0, SEEK_END)) { + int64_t fileSize = ftello(f); + if (fileSize > 0 && fileSize <= maxSize && !fseeko(f, 0, SEEK_SET)) { + unsigned char * fileData; + + *size = (unsigned int) fileSize; + fileData = malloc(*size); + if (fileData) { + if (fread(fileData, *size, 1, f) == 1) { + *data = fileData; + result = 0; + } else { + free(fileData); + } + } + } + fclose(f); + } + + return result; +} + int mar_extract_and_verify_signatures_fp(FILE *fp, CryptoX_ProviderHandle provider, CryptoX_PublicKey *keys, @@ -81,92 +121,8 @@ ReadAndUpdateVerifyContext(FILE *fp, * certificate given, the second signature will be verified using the second * certificate given, etc. The signature count must exactly match the number of * certificates given, and all signature verifications must succeed. - * This is only used by the signmar program when used with arguments to verify - * a MAR. This should not be used to verify a MAR that will be extracted in the - * same operation by updater code. This function prints the error message if - * verification fails. * - * @param pathToMARFile The path of the MAR file to verify. - * @param certData Pointer to the first element in an array of certificate - * file data. - * @param certDataSizes Pointer to the first element in an array for size of the - * cert data. - * @param certNames Pointer to the first element in an array of certificate names. - * Used only if compiled as NSS, specifies the certificate names - * @param certCount The number of elements in certData, certDataSizes, and certNames - * @return 0 on success - * a negative number if there was an error - * a positive number if the signature does not verify - */ -int -mar_verify_signatures(const char *pathToMARFile, - const uint8_t * const *certData, - const uint32_t *certDataSizes, - const char * const *certNames, - uint32_t certCount) { - int rv; - CryptoX_ProviderHandle provider = CryptoX_InvalidHandleValue; - CryptoX_Certificate certs[MAX_SIGNATURES]; - CryptoX_PublicKey keys[MAX_SIGNATURES]; - FILE *fp; - uint32_t k; - - memset(certs, 0, sizeof(certs)); - memset(keys, 0, sizeof(keys)); - - if (!pathToMARFile || certCount == 0) { - fprintf(stderr, "ERROR: Invalid parameter specified.\n"); - return CryptoX_Error; - } - - fp = fopen(pathToMARFile, "rb"); - if (!fp) { - fprintf(stderr, "ERROR: Could not open MAR file.\n"); - return CryptoX_Error; - } - - if (CryptoX_Failed(CryptoX_InitCryptoProvider(&provider))) { - fclose(fp); - fprintf(stderr, "ERROR: Could not init crytpo library.\n"); - return CryptoX_Error; - } - - /* Load the certs and keys */ - for (k = 0; k < certCount; k++) { - if (CryptoX_Failed(CryptoX_LoadPublicKey(provider, certData[k], certDataSizes[k], - &keys[k], certNames[k], &certs[k]))) { - fclose(fp); - fprintf(stderr, "ERROR: Could not load public key.\n"); - return CryptoX_Error; - } - } - - rv = mar_extract_and_verify_signatures_fp(fp, provider, keys, certCount); - fclose(fp); - - /* Cleanup the allocated keys and certs */ - for (k = 0; k < certCount; k++) { - if (keys[k]) { - CryptoX_FreePublicKey(&keys[k]); - } - - if (certs[k]) { - CryptoX_FreeCertificate(&certs[k]); - } - } - return rv; -} - -#ifdef XP_WIN -/** - * Verifies a MAR file by verifying each signature with the corresponding - * certificate. That is, the first signature will be verified using the first - * certificate given, the second signature will be verified using the second - * certificate given, etc. The signature count must exactly match the number of - * certificates given, and all signature verifications must succeed. - * - * @param pathToMARFile The path of the MAR file who's signature - * should be calculated + * @param mar The file who's signature should be calculated * @param certData Pointer to the first element in an array of * certificate data * @param certDataSizes Pointer to the first element in an array for size of @@ -175,17 +131,15 @@ mar_verify_signatures(const char *pathToMARFile, * @return 0 on success */ int -mar_verify_signaturesW(MarFile *mar, - const uint8_t * const *certData, - const uint32_t *certDataSizes, - uint32_t certCount) { +mar_verify_signatures(MarFile *mar, + const uint8_t * const *certData, + const uint32_t *certDataSizes, + uint32_t certCount) { int rv = -1; CryptoX_ProviderHandle provider = CryptoX_InvalidHandleValue; - CryptoX_Certificate certs[MAX_SIGNATURES]; CryptoX_PublicKey keys[MAX_SIGNATURES]; uint32_t k; - memset(certs, 0, sizeof(certs)); memset(keys, 0, sizeof(keys)); if (!mar || !certData || !certDataSizes || certCount == 0) { @@ -205,7 +159,7 @@ mar_verify_signaturesW(MarFile *mar, for (k = 0; k < certCount; ++k) { if (CryptoX_Failed(CryptoX_LoadPublicKey(provider, certData[k], certDataSizes[k], - &keys[k], "", &certs[k]))) { + &keys[k]))) { fprintf(stderr, "ERROR: Could not load public key.\n"); goto failure; } @@ -219,15 +173,10 @@ failure: if (keys[k]) { CryptoX_FreePublicKey(&keys[k]); } - - if (certs[k]) { - CryptoX_FreeCertificate(&certs[k]); - } } return rv; } -#endif /** * Extracts each signature from the specified MAR file, diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index bd6716b..52cdbeb 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -18,9 +18,14 @@ LIBS += \ $(MOZ_BZ2_LIBS) \ $(NULL) -ifeq ($(OS_ARCH),WINNT) +LIBS += $(call EXPAND_LIBNAME_PATH,signmar,$(DEPTH)/modules/libmar/sign) LIBS += $(call EXPAND_LIBNAME_PATH,verifymar,$(DEPTH)/modules/libmar/verify) +ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32 shlwapi) +else +LIBS += $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ + $(NSPR_LIBS) endif ifdef MOZ_WIDGET_GTK @@ -51,14 +56,13 @@ else ifneq (,$(filter nightly aurora nightly-elm nightly-profiling nightly-oak n PRIMARY_CERT = nightly_aurora_level3_primary.der SECONDARY_CERT = nightly_aurora_level3_secondary.der else - PRIMARY_CERT = dep1.der - SECONDARY_CERT = dep2.der + PRIMARY_CERT = xpcshellCertificate.der + SECONDARY_CERT = xpcshellCertificate.der endif export:: $(PYTHON) $(srcdir)/gen_cert_header.py primaryCertData $(srcdir)/$(PRIMARY_CERT) > primaryCert.h $(PYTHON) $(srcdir)/gen_cert_header.py secondaryCertData $(srcdir)/$(SECONDARY_CERT) > secondaryCert.h - $(PYTHON) $(srcdir)/gen_cert_header.py xpcshellCertData $(srcdir)/xpcshellCertificate.der > xpcshellCert.h ifdef MOZ_WIDGET_GTK libs:: updater.png diff --git a/toolkit/mozapps/update/updater/archivereader.cpp b/toolkit/mozapps/update/updater/archivereader.cpp index f0e6ea3..aa9ccc4 100644 --- a/toolkit/mozapps/update/updater/archivereader.cpp +++ b/toolkit/mozapps/update/updater/archivereader.cpp @@ -15,13 +15,10 @@ #include "updatehelper.h" #endif -#ifdef XP_WIN // These are generated at compile time based on the DER file for the channel // being used #include "primaryCert.h" #include "secondaryCert.h" -#include "xpcshellCert.h" -#endif #define UPDATER_NO_STRING_GLUE_STL #include "nsVersionComparator.cpp" @@ -38,9 +35,6 @@ static int outbuf_size = 262144; static char *inbuf = nullptr; static char *outbuf = nullptr; -#ifdef XP_WIN -#include "resource.h" - /** * Performs a verification on the opened MAR file with the passed in * certificate name ID and type ID. @@ -54,15 +48,13 @@ int VerifyLoadedCert(MarFile *archive, const uint8_t (&certData)[SIZE]) { const uint32_t size = SIZE; - const uint8_t * const data = &certData[0]; - if (mar_verify_signaturesW(archive, &data, &size, 1)) { + const uint8_t* const data = &certData[0]; + if (mar_verify_signatures(archive, &data, &size, 1)) { return CERT_VERIFY_ERROR; } return OK; } -#endif - /** * Performs a verification on the opened MAR file. Both the primary and backup @@ -79,22 +71,11 @@ ArchiveReader::VerifySignature() return ARCHIVE_NOT_OPEN; } -#ifdef XP_WIN - // If the fallback key exists we're running an XPCShell test and we should - // use the XPCShell specific cert for the signed MAR. - int rv; - if (DoesFallbackKeyExist()) { - rv = VerifyLoadedCert(mArchive, xpcshellCertData); - } else { - rv = VerifyLoadedCert(mArchive, primaryCertData); - if (rv != OK) { - rv = VerifyLoadedCert(mArchive, secondaryCertData); - } + int rv = VerifyLoadedCert(mArchive, primaryCertData); + if (rv != OK) { + rv = VerifyLoadedCert(mArchive, secondaryCertData); } return rv; -#else - return OK; -#endif } /** diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 4cf24db..3a3968e 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -108,6 +108,11 @@ static bool sUseHardLinks = true; # define MAYBE_USE_HARD_LINKS 0 #endif +#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) +#include "nss.h" +#include "prerror.h" +#endif + #ifdef XP_WIN #include "updatehelper.h" @@ -2520,6 +2525,20 @@ int NS_main(int argc, NS_tchar **argv) _exit(1); } #endif + +#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) + // On Windows we rely on CyrptoAPI to do verifications so we don't need to + // initialize NSS at all there. + // Otherwise, minimize the amount of NSS we depend on by avoiding all the NSS + // databases. + if (NSS_NoDB_Init(NULL) != SECSuccess) { + PRErrorCode error = PR_GetError(); + fprintf(stderr, "Could not initialize NSS: %s (%d)", + PR_ErrorToName(error), (int) error); + _exit(1); + } +#endif + InitProgressUI(&argc, &argv); // To process an update the updater command line must at a minimum have the

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 13379: Sign our MAR files.
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit 7612aeba131f3eca1c80a369aab97da6fc249565 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Dec 17 16:37:11 2014 -0500 Bug 13379: Sign our MAR files. Configure with --enable-signmar (build the signmar tool). Configure with --enable-verify-mar (when updating, require a valid signature on the MAR file before it is applied). Use the Tor Browser version instead of the Firefox version inside the MAR file info block (necessary to prevent downgrade attacks). Use NSS on all platforms for checking MAR signatures (Mozilla plans to use OS-native APIs on Mac OS and they already do so on Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on all platforms. Use SHA512-based MAR signatures instead of the SHA1-based ones that Mozilla uses. This is implemented inside MAR_USE_SHA512_RSA_SIG #ifdef's and with a signature algorithm ID of 512 to help avoid collisions with future work Mozilla might do in this area. See: https://bugzilla.mozilla.org/show_bug.cgi?id=1105689 --- .mozconfig | 4 +-- .mozconfig-mac | 4 +-- .mozconfig-mingw | 4 +-- modules/libmar/sign/mar_sign.c | 15 ++++++++-- modules/libmar/sign/moz.build | 1 + modules/libmar/src/mar_private.h | 8 +++++ modules/libmar/tool/Makefile.in | 1 - modules/libmar/tool/mar.c | 26 +++++++++++----- modules/libmar/tool/moz.build | 7 +++++ modules/libmar/verify/cryptox.c | 8 +++-- modules/libmar/verify/cryptox.h | 9 ++++++ modules/libmar/verify/mar_verify.c | 21 +++++++++++-- modules/libmar/verify/moz.build | 14 +++------ security/build/Makefile.in | 2 +- toolkit/mozapps/update/updater/Makefile.in | 14 ++++++++- toolkit/mozapps/update/updater/moz.build | 1 + toolkit/mozapps/update/updater/updater.cpp | 21 ++++++++----- toolkit/xre/nsUpdateDriver.cpp | 44 +++++++++++++++++----------- 18 files changed, 147 insertions(+), 57 deletions(-) diff --git a/.mozconfig b/.mozconfig index f0c5510..f2874e8 100755 --- a/.mozconfig +++ b/.mozconfig @@ -11,8 +11,8 @@ ac_add_options --enable-optimize ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging -# We do not use signed MAR files yet (Mozilla uses them on Windows only). -ac_add_options --disable-verify-mar +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar ac_add_options --disable-strip ac_add_options --disable-install-strip ac_add_options --disable-tests diff --git a/.mozconfig-mac b/.mozconfig-mac index 2c06c34..06dc226 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -38,8 +38,8 @@ ac_add_options --disable-debug ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging -# We do not use signed MAR files yet (Mozilla uses them on Windows only). -ac_add_options --disable-verify-mar +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar # ICU seems still to have cross-compiling issues: ac_add_options --without-intl-api diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 691178b..15954d7 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -16,8 +16,8 @@ ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-tor-browser-update ac_add_options --enable-update-packaging -# We do not use signed MAR files yet (Mozilla uses them on Windows only). -ac_add_options --disable-verify-mar +ac_add_options --enable-signmar +ac_add_options --enable-verify-mar # ICU seems still to have cross-compiling issues: # https://bugzilla.mozilla.org/show_bug.cgi?id=1019744#c19 diff --git a/modules/libmar/sign/mar_sign.c b/modules/libmar/sign/mar_sign.c index 6f21a31..e867d28 100644 --- a/modules/libmar/sign/mar_sign.c +++ b/modules/libmar/sign/mar_sign.c @@ -95,7 +95,12 @@ NSSSignBegin(const char *certName, return -1; } - *ctx = SGN_NewContext (SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE, *privKey); +#ifdef MAR_USE_SHA512_RSA_SIG + SECOidTag sigAlg = SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION; +#else + SECOidTag sigAlg = SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE; +#endif + *ctx = SGN_NewContext (sigAlg, *privKey); if (!*ctx) { fprintf(stderr, "ERROR: Could not create signature context\n"); return -1; @@ -991,8 +996,12 @@ mar_repackage_and_sign(const char *NSSConfigDir, signaturePlaceholderOffset = ftello(fpDest); for (k = 0; k < certCount; k++) { - /* Write out the signature algorithm ID, Only an ID of 1 is supported */ - signatureAlgorithmID = htonl(1); + /* Write out the signature algorithm ID. */ +#ifdef MAR_USE_SHA512_RSA_SIG + signatureAlgorithmID = htonl(SIGNATURE_ALGORITHM_ID_SHA512_RSA); +#else + signatureAlgorithmID = htonl(SIGNATURE_ALGORITHM_ID_SHA1_RSA); +#endif if (WriteAndUpdateSignatures(fpDest, &signatureAlgorithmID, sizeof(signatureAlgorithmID), ctxs, certCount, "num signatures")) { diff --git a/modules/libmar/sign/moz.build b/modules/libmar/sign/moz.build index a6d0308..2be6da2 100644 --- a/modules/libmar/sign/moz.build +++ b/modules/libmar/sign/moz.build @@ -19,6 +19,7 @@ LOCAL_INCLUDES += [ ] DEFINES['MAR_NSS'] = True +DEFINES['MAR_USE_SHA512_RSA_SIG'] = True if CONFIG['OS_ARCH'] == 'WINNT': USE_STATIC_LIBS = True diff --git a/modules/libmar/src/mar_private.h b/modules/libmar/src/mar_private.h index e0c2632..add03f5 100644 --- a/modules/libmar/src/mar_private.h +++ b/modules/libmar/src/mar_private.h @@ -21,6 +21,14 @@ which is 16 bytes */ #define SIGNATURE_BLOCK_OFFSET 16 +/* Signature algorithm IDs. */ +#define SIGNATURE_ALGORITHM_ID_SHA1_RSA 1 +#ifdef MAR_USE_SHA512_RSA_SIG +/* Use 512 as the algorithm ID so it is less likely that we will conflict with + whatever Mozilla chooses when they add support for a stronger signature. */ +#define SIGNATURE_ALGORITHM_ID_SHA512_RSA 512 +#endif + /* Make sure the file is less than 500MB. We do this to protect against invalid MAR files. */ #define MAX_SIZE_OF_MAR_FILE ((int64_t)524288000) diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in index fb456726..06ec0ea 100644 --- a/modules/libmar/tool/Makefile.in +++ b/modules/libmar/tool/Makefile.in @@ -44,6 +44,5 @@ include $(topsrcdir)/config/rules.mk ifdef CROSS_COMPILE ifdef HOST_NSPR_MDCPUCFG HOST_CFLAGS += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG) -CFLAGS += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG) endif endif diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c index 821813c..82701a9 100644 --- a/modules/libmar/tool/mar.c +++ b/modules/libmar/tool/mar.c @@ -31,7 +31,11 @@ int mar_repackage_and_sign(const char *NSSConfigDir, const char * dest); static void print_version() { +#ifdef TOR_BROWSER_UPDATE + printf("Version: %s\n", TOR_BROWSER_VERSION); +#else printf("Version: %s\n", MOZ_APP_VERSION); +#endif printf("Default Channel ID: %s\n", MAR_CHANNEL_ID); } @@ -61,7 +65,7 @@ static void print_usage() { "signed_input_archive.mar base_64_encoded_signature_file " "changed_signed_output.mar\n"); printf("(i) is the index of the certificate to extract\n"); -#if defined(XP_MACOSX) || (defined(XP_WIN) && !defined(MAR_NSS)) +#if (defined(XP_MACOSX) || defined(XP_WIN)) && !defined(MAR_NSS) printf("Verify a MAR file:\n"); printf(" mar [-C workingDir] -D DERFilePath -v signed_archive.mar\n"); printf("At most %d signature certificate DER files are specified by " @@ -116,7 +120,11 @@ int main(int argc, char **argv) { char *NSSConfigDir = NULL; const char *certNames[MAX_SIGNATURES]; char *MARChannelID = MAR_CHANNEL_ID; +#ifdef TOR_BROWSER_UPDATE + char *productVersion = TOR_BROWSER_VERSION; +#else char *productVersion = MOZ_APP_VERSION; +#endif uint32_t i, k; int rv = -1; uint32_t certCount = 0; @@ -135,8 +143,8 @@ int main(int argc, char **argv) { #if defined(XP_WIN) && !defined(MAR_NSS) && !defined(NO_SIGN_VERIFY) memset(certBuffers, 0, sizeof(certBuffers)); #endif -#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \ - defined(XP_MACOSX)) +#if !defined(NO_SIGN_VERIFY) && (!defined(MAR_NSS) && (defined(XP_WIN) || \ + defined(XP_MACOSX))) memset(DERFilePaths, 0, sizeof(DERFilePaths)); memset(fileSizes, 0, sizeof(fileSizes)); #endif @@ -165,8 +173,8 @@ int main(int argc, char **argv) { argv += 2; argc -= 2; } -#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \ - defined(XP_MACOSX)) +#if !defined(NO_SIGN_VERIFY) && (!defined(MAR_NSS) && (defined(XP_WIN) || \ + defined(XP_MACOSX))) /* -D DERFilePath, also matches -D[index] DERFilePath We allow an index for verifying to be symmetric with the import and export command line arguments. */ @@ -341,6 +349,10 @@ int main(int argc, char **argv) { #if (defined(XP_WIN) || defined(XP_MACOSX)) && !defined(MAR_NSS) rv = mar_read_entire_file(DERFilePaths[k], MAR_MAX_CERT_SIZE, &certBuffers[k], &fileSizes[k]); + if (rv) { + fprintf(stderr, "ERROR: could not read file %s", DERFilePaths[k]); + break; + } #else /* It is somewhat circuitous to look up a CERTCertificate and then pass * in its DER encoding just so we can later re-create that @@ -357,11 +369,11 @@ int main(int argc, char **argv) { } else { rv = -1; } -#endif if (rv) { - fprintf(stderr, "ERROR: could not read file %s", DERFilePaths[k]); + fprintf(stderr, "ERROR: no certificate named %s", certNames[k]); break; } +#endif } if (!rv) { diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build index 9e739e0..6b14e00 100644 --- a/modules/libmar/tool/moz.build +++ b/modules/libmar/tool/moz.build @@ -17,8 +17,15 @@ HOST_PROGRAM = 'mar' for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'): DEFINES[var] = '"%s"' % CONFIG[var] +if CONFIG['TOR_BROWSER_UPDATE']: + DEFINES['TOR_BROWSER_UPDATE'] = '%s' % CONFIG['TOR_BROWSER_UPDATE'] +if CONFIG['TOR_BROWSER_VERSION']: + DEFINES['TOR_BROWSER_VERSION'] = '"%s"' % CONFIG['TOR_BROWSER_VERSION'] + if not CONFIG['MOZ_ENABLE_SIGNMAR']: DEFINES['NO_SIGN_VERIFY'] = True +else: + DEFINES['MAR_NSS'] = True if CONFIG['OS_ARCH'] == 'WINNT': USE_STATIC_LIBS = True diff --git a/modules/libmar/verify/cryptox.c b/modules/libmar/verify/cryptox.c index af34210..f39669b 100644 --- a/modules/libmar/verify/cryptox.c +++ b/modules/libmar/verify/cryptox.c @@ -64,8 +64,12 @@ NSS_VerifyBegin(VFYContext **ctx, return CryptoX_Error; } - *ctx = VFY_CreateContext(*publicKey, NULL, - SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE, NULL); +#ifdef MAR_USE_SHA512_RSA_SIG + SECOidTag sigAlg = SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION; +#else + SECOidTag sigAlg = SEC_OID_ISO_SHA1_WITH_RSA_SIGNATURE; +#endif + *ctx = VFY_CreateContext(*publicKey, NULL, sigAlg, NULL); if (*ctx == NULL) { return CryptoX_Error; } diff --git a/modules/libmar/verify/cryptox.h b/modules/libmar/verify/cryptox.h index ec8f5ac..8f579b6 100644 --- a/modules/libmar/verify/cryptox.h +++ b/modules/libmar/verify/cryptox.h @@ -59,6 +59,10 @@ CryptoX_Result NSS_VerifySignature(VFYContext * const *ctx , #elif XP_MACOSX +#ifdef MAR_USE_SHA512_RSA_SIG +#error MAR_USE_SHA512_RSA_SIG is not implemented. +#endif + #define CryptoX_InvalidHandleValue NULL #define CryptoX_ProviderHandle void* #define CryptoX_SignatureHandle void* @@ -105,6 +109,11 @@ void CryptoMac_FreePublicKey(CryptoX_PublicKey* aPublicKey); #elif defined(XP_WIN) +#ifdef MAR_USE_SHA512_RSA_SIG +#error MAR_USE_SHA512_RSA_SIG is not implemented. +#endif + + #include <windows.h> #include <wincrypt.h> diff --git a/modules/libmar/verify/mar_verify.c b/modules/libmar/verify/mar_verify.c index 165a802..78b3247 100644 --- a/modules/libmar/verify/mar_verify.c +++ b/modules/libmar/verify/mar_verify.c @@ -276,8 +276,25 @@ mar_extract_and_verify_signatures_fp(FILE *fp, } /* We don't try to verify signatures we don't know about */ - if (signatureAlgorithmIDs[i] != 1) { - fprintf(stderr, "ERROR: Unknown signature algorithm ID.\n"); +#ifdef MAR_USE_SHA512_RSA_SIG + const uint32_t kSupportedAlgID = SIGNATURE_ALGORITHM_ID_SHA512_RSA; +#else + const uint32_t kSupportedAlgID = SIGNATURE_ALGORITHM_ID_SHA1_RSA; +#endif + + if (signatureAlgorithmIDs[i] != kSupportedAlgID) { +#ifdef MAR_USE_SHA512_RSA_SIG + if (signatureAlgorithmIDs[i] == SIGNATURE_ALGORITHM_ID_SHA1_RSA) { + fprintf(stderr, + "ERROR: Unsupported signature algorithm (SHA1 with RSA).\n"); + } else { + fprintf(stderr, "ERROR: Unknown signature algorithm ID %u.\n", + signatureAlgorithmIDs[i]); + } +#else + fprintf(stderr, "ERROR: Unknown signature algorithm ID %u.\n", + signatureAlgorithmIDs[i]); +#endif for (i = 0; i < signatureCount; ++i) { free(extractedSignatures[i]); } diff --git a/modules/libmar/verify/moz.build b/modules/libmar/verify/moz.build index 6667bc1..ec5a3a2 100644 --- a/modules/libmar/verify/moz.build +++ b/modules/libmar/verify/moz.build @@ -15,16 +15,10 @@ FORCE_STATIC_LIB = True if CONFIG['OS_ARCH'] == 'WINNT': USE_STATIC_LIBS = True -elif CONFIG['OS_ARCH'] == 'Darwin': - UNIFIED_SOURCES += [ - 'MacVerifyCrypto.cpp', - ] - LDFLAGS += [ - '-framework Security', - ] -else: - DEFINES['MAR_NSS'] = True - LOCAL_INCLUDES += ['../sign'] + +DEFINES['MAR_NSS'] = True +DEFINES['MAR_USE_SHA512_RSA_SIG'] = True +LOCAL_INCLUDES += ['../sign'] LOCAL_INCLUDES += [ '../src', diff --git a/security/build/Makefile.in b/security/build/Makefile.in index 0453492..816acd9 100644 --- a/security/build/Makefile.in +++ b/security/build/Makefile.in @@ -289,11 +289,11 @@ endif NSS_DIRS += \ nss/cmd/lib \ nss/cmd/shlibsign \ + nss/cmd/certutil \ $(NULL) ifdef ENABLE_TESTS NSS_DIRS += \ - nss/cmd/certutil \ nss/cmd/pk12util \ nss/cmd/modutil \ $(NULL) diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index 52cdbeb..bdb9f27 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -3,6 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Use NSS for MAR signature verification on all platforms: +MAR_NSS=1 + # Don't link the updater against libmozglue. See bug 687139 MOZ_GLUE_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS = @@ -22,7 +25,14 @@ LIBS += $(call EXPAND_LIBNAME_PATH,signmar,$(DEPTH)/modules/libmar/sign) LIBS += $(call EXPAND_LIBNAME_PATH,verifymar,$(DEPTH)/modules/libmar/verify) ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32 shlwapi) +ifdef MAR_NSS +LINK_UPDATER_WITH_NSS=1 +endif else +LINK_UPDATER_WITH_NSS=1 +endif + +ifdef LINK_UPDATER_WITH_NSS LIBS += $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ $(NSPR_LIBS) @@ -49,7 +59,7 @@ endif include $(topsrcdir)/config/rules.mk -ifneq (,$(filter beta release esr,$(MOZ_UPDATE_CHANNEL))) +ifneq (,$(filter alpha beta release esr,$(MOZ_UPDATE_CHANNEL))) PRIMARY_CERT = release_primary.der SECONDARY_CERT = release_secondary.der else ifneq (,$(filter nightly aurora nightly-elm nightly-profiling nightly-oak nightly-ux,$(MOZ_UPDATE_CHANNEL))) @@ -81,9 +91,11 @@ libs:: rm -f $(DIST)/bin/updater endif +ifndef LINK_UPDATER_WITH_NSS ifeq ($(OS_ARCH),WINNT) EXTRA_LIBS += $(call EXPAND_LIBNAME,crypt32) EXTRA_LIBS += $(call EXPAND_LIBNAME,advapi32) endif +endif CXXFLAGS += $(MOZ_BZ2_CFLAGS) diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build index 833164a..950a6f8 100644 --- a/toolkit/mozapps/update/updater/moz.build +++ b/toolkit/mozapps/update/updater/moz.build @@ -57,6 +57,7 @@ if have_progressui == 0: 'progressui_null.cpp', ] +DEFINES['MAR_NSS'] = True DEFINES['NS_NO_XPCOM'] = True DISABLE_STL_WRAPPING = True for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'): diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 3a3968e..80de531 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -108,10 +108,12 @@ static bool sUseHardLinks = true; # define MAYBE_USE_HARD_LINKS 0 #endif -#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) +#if defined(MOZ_VERIFY_MAR_SIGNATURE) +#if defined(MAR_NSS) || !defined(XP_WIN) #include "nss.h" #include "prerror.h" #endif +#endif #ifdef XP_WIN #include "updatehelper.h" @@ -2422,8 +2424,13 @@ UpdateThreadFunc(void *param) MARStrings.MARChannelID[0] = '\0'; } +#ifdef TOR_BROWSER_UPDATE + const char *appVersion = TOR_BROWSER_VERSION; +#else + const char *appVersion = MOZ_APP_VERSION; +#endif rv = gArchiveReader.VerifyProductInformation(MARStrings.MARChannelID, - MOZ_APP_VERSION); + appVersion); } } #endif @@ -2526,11 +2533,10 @@ int NS_main(int argc, NS_tchar **argv) } #endif -#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) - // On Windows we rely on CyrptoAPI to do verifications so we don't need to - // initialize NSS at all there. - // Otherwise, minimize the amount of NSS we depend on by avoiding all the NSS - // databases. +#if defined(MOZ_VERIFY_MAR_SIGNATURE) +#if defined(MAR_NSS) || !defined(XP_WIN) + // If using NSS for signature verification, initialize NSS but minimize + // the portion we depend on by avoiding all of the NSS databases. if (NSS_NoDB_Init(NULL) != SECSuccess) { PRErrorCode error = PR_GetError(); fprintf(stderr, "Could not initialize NSS: %s (%d)", @@ -2538,6 +2544,7 @@ int NS_main(int argc, NS_tchar **argv) _exit(1); } #endif +#endif InitProgressUI(&argc, &argv); diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index 1188736..aeb2b6b 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -17,6 +17,7 @@ #include "prproces.h" #include "prlog.h" #include "prenv.h" +#include "prprf.h" #include "nsVersionComparator.h" #include "nsXREDirProvider.h" #include "SpecialSystemDirectory.h" @@ -39,7 +40,6 @@ # include <windows.h> # include <shlwapi.h> # include "nsWindowsHelpers.h" -# include "prprf.h" # define getcwd(path, size) _getcwd(path, size) # define getpid() GetCurrentProcessId() #elif defined(XP_UNIX) @@ -134,25 +134,39 @@ GetCurrentWorkingDir(char *buf, size_t size) } +// In Tor Browser, updater(.exe) depends on some shared libraries that are +// located in the app directory. To allow the updater to run when it has been +// copied into the update directory, we prepend the app directory to the +// appropriate environment variable so it will be searched by the dynamic +// linker. + #if defined(XP_WIN) #define PATH_SEPARATOR ";" +#define LD_LIBRARY_PATH_ENVVAR_NAME "PATH" +#else +#define PATH_SEPARATOR ":" +#if defined(XP_MACOSX) +#define LD_LIBRARY_PATH_ENVVAR_NAME "DYLD_LIBRARY_PATH" +#else +#define LD_LIBRARY_PATH_ENVVAR_NAME "LD_LIBRARY_PATH" +#endif +#endif -// In Tor Browser, updater.exe depends on some DLLs that are located in the -// app directory. To allow the updater to run when it has been copied into -// the update directory, we append the app directory to the PATH. static nsresult -AdjustPathForUpdater(nsIFile *appDir) +AdjustLibSearchPathForUpdater(nsIFile *appDir) { nsAutoCString appPath; nsresult rv = appDir->GetNativePath(appPath); NS_ENSURE_SUCCESS(rv, rv); char *s = nullptr; - char *pathValue = PR_GetEnv("PATH"); + char *pathValue = PR_GetEnv(LD_LIBRARY_PATH_ENVVAR_NAME); if ((nullptr == pathValue) || ('\0' == *pathValue)) { - s = PR_smprintf("PATH=%s", appPath.get()); + s = PR_smprintf("%s=%s", + LD_LIBRARY_PATH_ENVVAR_NAME, appPath.get()); } else { - s = PR_smprintf("PATH=%s" PATH_SEPARATOR "%s", pathValue, appPath.get()); + s = PR_smprintf("%s=%s" PATH_SEPARATOR "%s", + LD_LIBRARY_PATH_ENVVAR_NAME, appPath.get(), pathValue); } // We intentionally leak the value that is passed into PR_SetEnv() because @@ -162,7 +176,7 @@ AdjustPathForUpdater(nsIFile *appDir) return NS_OK; } -#endif + #ifdef DEBUG static void @@ -623,12 +637,10 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, PR_SetEnv("MOZ_SAFE_MODE_RESTART=1"); } -#if defined(XP_WIN) - nsresult rv2 = AdjustPathForUpdater(appDir); + nsresult rv2 = AdjustLibSearchPathForUpdater(appDir); if (NS_FAILED(rv2)) { - LOG(("SwitchToUpdatedApp -- AdjustPathForUpdater failed (0x%x)\n", rv2)); + LOG(("SwitchToUpdatedApp -- AdjustLibSearchPathForUpdater failed (0x%x)\n", rv2)); } -#endif LOG(("spawning updater process for replacing [%s]\n", updaterPath.get())); @@ -920,12 +932,10 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, PR_SetEnv("MOZ_OS_UPDATE=1"); } -#if defined(XP_WIN) - nsresult rv2 = AdjustPathForUpdater(appDir); + nsresult rv2 = AdjustLibSearchPathForUpdater(appDir); if (NS_FAILED(rv2)) { - LOG(("ApplyUpdate -- AdjustPathForUpdater failed (0x%x)\n", rv2)); + LOG(("ApplyUpdate -- AdjustLibSearchPathForUpdater failed (0x%x)\n", rv2)); } -#endif #if defined(MOZ_WIDGET_GONK) // We want the updater to be CPU friendly and not subject to being killed by

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 902761 - Stop storing certs used for MAR verification in EXE resource files. r=rstrong
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit 9c7ea1fb1df0545990a85aabcef8180ea287305f Author: Brian R. Bondy <netzen(a)gmail.com> Date: Wed Oct 15 23:01:11 2014 -0400 Bug 902761 - Stop storing certs used for MAR verification in EXE resource files. r=rstrong --- toolkit/mozapps/update/updater/archivereader.cpp | 70 ++++++---------------- toolkit/mozapps/update/updater/updater.rc | 19 ------ 2 files changed, 18 insertions(+), 71 deletions(-) diff --git a/toolkit/mozapps/update/updater/archivereader.cpp b/toolkit/mozapps/update/updater/archivereader.cpp index 271905d..f0e6ea3 100644 --- a/toolkit/mozapps/update/updater/archivereader.cpp +++ b/toolkit/mozapps/update/updater/archivereader.cpp @@ -15,6 +15,14 @@ #include "updatehelper.h" #endif +#ifdef XP_WIN +// These are generated at compile time based on the DER file for the channel +// being used +#include "primaryCert.h" +#include "secondaryCert.h" +#include "xpcshellCert.h" +#endif + #define UPDATER_NO_STRING_GLUE_STL #include "nsVersionComparator.cpp" #undef UPDATER_NO_STRING_GLUE_STL @@ -34,61 +42,19 @@ static char *outbuf = nullptr; #include "resource.h" /** - * Obtains the data of the specified resource name and type. - * - * @param name The name ID of the resource - * @param type The type ID of the resource - * @param data Out parameter which sets the pointer to a buffer containing - * the needed data. - * @param size Out parameter which sets the size of the returned data buffer - * @return TRUE on success -*/ -BOOL -LoadFileInResource(int name, int type, const uint8_t *&data, uint32_t& size) -{ - HMODULE handle = GetModuleHandle(nullptr); - if (!handle) { - return FALSE; - } - - HRSRC resourceInfoBlockHandle = FindResource(handle, - MAKEINTRESOURCE(name), - MAKEINTRESOURCE(type)); - if (!resourceInfoBlockHandle) { - FreeLibrary(handle); - return FALSE; - } - - HGLOBAL resourceHandle = LoadResource(handle, resourceInfoBlockHandle); - if (!resourceHandle) { - FreeLibrary(handle); - return FALSE; - } - - size = SizeofResource(handle, resourceInfoBlockHandle); - data = static_cast<const uint8_t*>(::LockResource(resourceHandle)); - FreeLibrary(handle); - return TRUE; -} - -/** * Performs a verification on the opened MAR file with the passed in * certificate name ID and type ID. * - * @param archive The MAR file to verify the signature on - * @param name The name ID of the resource - * @param type THe type ID of the resource - * @return OK on success, CERT_LOAD_ERROR or CERT_VERIFY_ERROR on failure. + * @param archive The MAR file to verify the signature on. + * @param certData The certificate data. + * @return OK on success, CERT_VERIFY_ERROR on failure. */ +template<uint32_t SIZE> int -VerifyLoadedCert(MarFile *archive, int name, int type) +VerifyLoadedCert(MarFile *archive, const uint8_t (&certData)[SIZE]) { - uint32_t size = 0; - const uint8_t *data = nullptr; - if (!LoadFileInResource(name, type, data, size) || !data || !size) { - return CERT_LOAD_ERROR; - } - + const uint32_t size = SIZE; + const uint8_t * const data = &certData[0]; if (mar_verify_signaturesW(archive, &data, &size, 1)) { return CERT_VERIFY_ERROR; } @@ -118,11 +84,11 @@ ArchiveReader::VerifySignature() // use the XPCShell specific cert for the signed MAR. int rv; if (DoesFallbackKeyExist()) { - rv = VerifyLoadedCert(mArchive, IDR_XPCSHELL_CERT, TYPE_CERT); + rv = VerifyLoadedCert(mArchive, xpcshellCertData); } else { - rv = VerifyLoadedCert(mArchive, IDR_PRIMARY_CERT, TYPE_CERT); + rv = VerifyLoadedCert(mArchive, primaryCertData); if (rv != OK) { - rv = VerifyLoadedCert(mArchive, IDR_BACKUP_CERT, TYPE_CERT); + rv = VerifyLoadedCert(mArchive, secondaryCertData); } } return rv; diff --git a/toolkit/mozapps/update/updater/updater.rc b/toolkit/mozapps/update/updater/updater.rc index acea427..5dc4c85 100644 --- a/toolkit/mozapps/update/updater/updater.rc +++ b/toolkit/mozapps/update/updater/updater.rc @@ -42,25 +42,6 @@ IDI_DIALOG ICON "updater.ico" ///////////////////////////////////////////////////////////////////////////// // -// Embedded certificates for allowed MARs -// - -#if defined(MAR_SIGNING_RELEASE_BETA) -IDR_PRIMARY_CERT TYPE_CERT "release_primary.der" -IDR_BACKUP_CERT TYPE_CERT "release_secondary.der" -#elif defined(MAR_SIGNING_AURORA_NIGHTLY) -IDR_PRIMARY_CERT TYPE_CERT "nightly_aurora_level3_primary.der" -IDR_BACKUP_CERT TYPE_CERT "nightly_aurora_level3_secondary.der" -#else -IDR_PRIMARY_CERT TYPE_CERT "dep1.der" -IDR_BACKUP_CERT TYPE_CERT "dep2.der" -#endif - -IDR_XPCSHELL_CERT TYPE_CERT "xpcshellCertificate.der" - - -///////////////////////////////////////////////////////////////////////////// -// // Embedded an identifier to uniquely identiy this as a Mozilla updater. //

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 902761 - Build configuration for turning .der files into .h files. r=rstrong
by brade＠torproject.org 17 Dec '14

17 Dec '14

commit 7d87311b58709d8ab2a8ec052e0613b574b19a7b Author: Brian R. Bondy <netzen(a)gmail.com> Date: Wed Oct 15 23:00:23 2014 -0400 Bug 902761 - Build configuration for turning .der files into .h files. r=rstrong --- toolkit/mozapps/update/updater/Makefile.in | 16 +++++++++++++ toolkit/mozapps/update/updater/gen_cert_header.py | 25 +++++++++++++++++++++ toolkit/mozapps/update/updater/moz.build | 4 ---- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index d4c06b9..bd6716b 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -44,6 +44,22 @@ endif include $(topsrcdir)/config/rules.mk +ifneq (,$(filter beta release esr,$(MOZ_UPDATE_CHANNEL))) + PRIMARY_CERT = release_primary.der + SECONDARY_CERT = release_secondary.der +else ifneq (,$(filter nightly aurora nightly-elm nightly-profiling nightly-oak nightly-ux,$(MOZ_UPDATE_CHANNEL))) + PRIMARY_CERT = nightly_aurora_level3_primary.der + SECONDARY_CERT = nightly_aurora_level3_secondary.der +else + PRIMARY_CERT = dep1.der + SECONDARY_CERT = dep2.der +endif + +export:: + $(PYTHON) $(srcdir)/gen_cert_header.py primaryCertData $(srcdir)/$(PRIMARY_CERT) > primaryCert.h + $(PYTHON) $(srcdir)/gen_cert_header.py secondaryCertData $(srcdir)/$(SECONDARY_CERT) > secondaryCert.h + $(PYTHON) $(srcdir)/gen_cert_header.py xpcshellCertData $(srcdir)/xpcshellCertificate.der > xpcshellCert.h + ifdef MOZ_WIDGET_GTK libs:: updater.png $(NSINSTALL) -D $(DIST)/bin/icons diff --git a/toolkit/mozapps/update/updater/gen_cert_header.py b/toolkit/mozapps/update/updater/gen_cert_header.py new file mode 100644 index 0000000..182e98b --- /dev/null +++ b/toolkit/mozapps/update/updater/gen_cert_header.py @@ -0,0 +1,25 @@ +import sys +import binascii + +def file_byte_generator(filename, block_size = 512): + with open(filename, "rb") as f: + while True: + block = f.read(block_size) + if block: + for byte in block: + yield byte + else: + break + +def create_header(array_name, in_filename): + hexified = ["0x" + binascii.hexlify(byte) for byte in file_byte_generator(in_filename)] + print "const uint8_t " + array_name + "[] = {" + print ", ".join(hexified) + print "};" + return 0 + +if __name__ == '__main__': + if len(sys.argv) < 3: + print 'ERROR: usage: gen_cert_header.py array_name in_filename' + sys.exit(1); + sys.exit(create_header(sys.argv[1], sys.argv[2])) diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build index ba1c088..833164a 100644 --- a/toolkit/mozapps/update/updater/moz.build +++ b/toolkit/mozapps/update/updater/moz.build @@ -78,7 +78,3 @@ if CONFIG['_MSC_VER']: elif CONFIG['OS_ARCH'] == 'WINNT': WIN32_EXE_LDFLAGS += ['-municode'] -if CONFIG['MOZ_UPDATE_CHANNEL'] in ('beta', 'release', 'esr'): - DEFINES['MAR_SIGNING_RELEASE_BETA'] = '1' -elif CONFIG['MOZ_UPDATE_CHANNEL'] in ('nightly', 'aurora', 'nightly-elm', 'nightly-profiling', 'nightly-oak', 'nightly-ux'): - DEFINES['MAR_SIGNING_AURORA_NIGHTLY'] = '1'

1 0

[tor-browser-bundle/master] Bug #13776: Incremental MAR files not reproducible
by brade＠torproject.org 12 Dec '14

12 Dec '14

commit 5130f4ded3705e13f2d20fe49a502ec11e8d7cf2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Dec 12 11:54:40 2014 -0500 Bug #13776: Incremental MAR files not reproducible Set the locale and umask to avoid differences across systems and users when generating incremental MAR files. --- tools/update-responses/update_responses | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index c788586..b28b575 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -10,9 +10,16 @@ use Cwd; use File::Temp; use File::Find; use File::Which; +use POSIX qw(setlocale LC_ALL); use IO::CaptureOutput qw(capture_exec); use Parallel::ForkManager; +# Set umask and locale to provide a consistent environment for MAR file +# generation, etc. +umask(0022); +$ENV{"LC_ALL"} = "C"; +setlocale(LC_ALL, "C"); + my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles = ( '.' => 1, '..' => 1, 'no-update.xml' => 1 );

1 0

[torbutton/master] Bug 11449: Avoid new identity error when NoScript disabled.
by brade＠torproject.org 11 Dec '14

11 Dec '14

commit 88dfaaaf325f5b86aba3d449b87320d0d962681d Author: Loic Bistuer <loic.bistuer(a)gmail.com> Date: Tue Oct 21 02:30:20 2014 +0700 Bug 11449: Avoid new identity error when NoScript disabled. --- src/chrome/content/torbutton.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2ba4159..5aed682 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1646,8 +1646,10 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Clearing NoScript Temporary Permissions"); try { - var nsSvc = Components.classes["@maone.net/noscript-service;1"].getService().wrappedJSObject - nsSvc.eraseTemp(); + if ("@maone.net/noscript-service;1" in Components.classes) { + var nsSvc = Components.classes["@maone.net/noscript-service;1"].getService().wrappedJSObject + nsSvc.eraseTemp(); + } } catch(e) { torbutton_log(5, "New Identity: Error clearing NoScript Temporary Permissions: "+e); window.alert("Torbutton: Error clearing NoScript Temporary Permissions: "+e);

1 0

[tor-browser/tor-browser-31.3.0esr-4.5-1] Bug 13439: No canvas prompt for content-callers.
by gk＠torproject.org 09 Dec '14

09 Dec '14

commit fc1c9ff7c1b2defdbc039f12214767608f46423f Author: Gunes Acar <gunes.acar(a)esat.kuleuven.be> Date: Wed Dec 3 20:22:22 2014 +0100 Bug 13439: No canvas prompt for content-callers. Both the Inspector and PDF.js raise canvas prompts although they are no danger as they are delivered with the browser itself and are no untrusted content. This patch exempts both of them from canvas prompts, too. If calling `DescribeScriptedCaller` fails neither `scriptFile` nor `scriptLine` are logged. --- content/canvas/src/CanvasUtils.cpp | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/content/canvas/src/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp index 9a7a441..5a6e05e 100644 --- a/content/canvas/src/CanvasUtils.cpp +++ b/content/canvas/src/CanvasUtils.cpp @@ -54,6 +54,20 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) if (sop && nsContentUtils::IsSystemPrincipal(sop->GetPrincipal())) return true; + // Don't show canvas prompt for chrome scripts (e.g. Page Inspector) + if (nsContentUtils::IsCallerChrome()) + return true; + + JS::AutoFilename scriptFile; + unsigned scriptLine = 0; + bool isScriptKnown = false; + if (JS::DescribeScriptedCaller(aCx, &scriptFile, &scriptLine)) { + isScriptKnown = true; + // Don't show canvas prompt for PDF.js + if (scriptFile.get() && + strcmp(scriptFile.get(), "resource://pdf.js/build/pdf.js") == 0) + return true; + } bool isAllowed = false; nsCOMPtr<mozIThirdPartyUtil> thirdPartyUtil = do_GetService(THIRDPARTYUTIL_CONTRACTID); @@ -87,19 +101,19 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) rv = thirdPartyUtil->IsThirdPartyURI(uri, docURI, &isThirdParty); NS_ENSURE_SUCCESS(rv, false); - JS::AutoFilename scriptFile;; - unsigned scriptLine = 0; - JS::DescribeScriptedCaller(aCx, &scriptFile, &scriptLine); - nsCString firstPartySpec; rv = uri->GetSpec(firstPartySpec); nsCString docSpec; docURI->GetSpec(docSpec); nsPrintfCString msg("On %s: blocked access to canvas image data" - " from document %s, script from %s:%u ", // L10n - firstPartySpec.get(), docSpec.get(), - scriptFile.get(), scriptLine); - + " from document %s, ", // L10n + firstPartySpec.get(), docSpec.get()); + if (isScriptKnown && scriptFile.get()) { + msg += nsPrintfCString("script from %s:%u", // L10n + scriptFile.get(), scriptLine); + } else { + msg += nsPrintfCString("unknown script"); // L10n + } nsCOMPtr<nsIConsoleService> console (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); if (console)

1 0

[torbutton/master] Bug #13881. Localize strings for tor circuit display
by gk＠torproject.org 08 Dec '14

08 Dec '14

commit 000d727a34a7256d993662ce848112c419520860 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Dec 5 16:08:21 2014 -0800 Bug #13881. Localize strings for tor circuit display --- src/chrome/content/popup.xul | 2 +- src/chrome/content/tor-circuit-display.js | 20 ++++++++++++++++---- src/chrome/locale/en/torbutton.dtd | 1 + src/chrome/locale/en/torbutton.properties | 5 +++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 2965ec5..5f12f2b 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -51,7 +51,7 @@ <svg xmlns="http://www.w3.org/2000/svg" version="1.1" baseProfile="full" width="290" height="140" id="tor-circuit" style="display:none;"> <rect x="0" y="0" width="100%" height="100%" fill="#e8f4f4" /> - <text id="title" style="font-size:14px;font-weight:bold;" x="10" y="20" fill="#2c26a7">Tor circuit for this site</text> + <text id="title" style="font-size:14px;font-weight:bold;" x="10" y="20" fill="#2c26a7">&torbutton.circuit_display.title;</text> <text id="domain" style="font-size:13px;" x="10" y="38" fill="black">(trac.torproject.org)</text> <rect x="18.5" width="3" y="56" height="64" fill="#4d363a" stroke-width="0"/> <circle class="node-circle" cx="20" cy="56" r="4" /> diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 4c31bc6..d0977f1 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -151,6 +151,17 @@ let collectIsolationData = function (aController) { // ## User interface +// __torbuttonBundle__. +// Bundle of localized strings for torbutton UI. +let torbuttonBundle = Services.strings.createBundle( + "chrome://torbutton/locale/torbutton.properties"); + +// __uiString__. +// Read the localized strings for this UI. +let uiString = function (shortName) { + return torbuttonBundle.GetStringFromName("torbutton.circuit_display." + shortName); +}; + // __regionBundle__. // A list of localized region (country) names. let regionBundle = Services.strings.createBundle( @@ -181,14 +192,15 @@ let showCircuitDisplay = function (show) { // and converts each node data to text, as // `"France (12.34.56.78)"`. let nodeLines = function (nodeData) { - let result = ["This browser"]; + let result = [uiString("this_browser")]; for (let {ip, countryCode, type} of nodeData) { let bridge = type === "bridge"; result.push((countryCode ? localizedCountryNameFromCode(countryCode) - : "Unknown country") + - " (" + (bridge ? "Bridge" : (ip || "IP unknown")) + ")"); + : uiString("unknown_country")) + + " (" + (bridge ? uiString("tor_bridge") + : (ip || uiString("ip_unknown"))) + ")"); } - result[4] = "Internet"; + result[4] = uiString("internet"); return result; }; diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 283032b..72c7d41 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -155,3 +155,4 @@ <!ENTITY torbutton.prefs.sec_med_high "Medium-High"> <!ENTITY torbutton.prefs.sec_high "High"> <!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index c76be32..c3e85a3 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -1,5 +1,10 @@ torbutton.button.tooltip.disabled = Enable Tor torbutton.button.tooltip.enabled = Disable Tor +torbutton.circuit_display.internet = Internet +torbutton.circuit_display.ip_unknown = IP unknown +torbutton.circuit_display.this_browser = This browser +torbutton.circuit_display.tor_bridge = Bridge +torbutton.circuit_display.unknown_country = Unknown country torbutton.panel.tooltip.disabled = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.plugins.disabled = Click to enable plugins

1 0

[tor-browser-bundle/master] Updated Changelog for 4.5-alpha-2.
by gk＠torproject.org 05 Dec '14

05 Dec '14

commit ce9ae81c8ed530b39ff4be99b2f2053ff74b597c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 5 08:15:38 2014 +0000 Updated Changelog for 4.5-alpha-2. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f1511b0..11cf88b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -8,6 +8,7 @@ Tor Browser 4.5-alpha-2 -- Dec 5 2014 * Bug 13671: Make bridges visible on circuit display * Bug 9387: Incorporate user feedback * Bug 13784: Remove third party authentication tokens + * Bug 13435: Remove our custom POODLE fix (fixed by Mozilla in ESR 31.3.0) Tor Browser 4.0.2 -- Dec 2 2014 * All Platforms

1 0

[torbutton/master] fixup! #13671: fix circuit display when bridges are used
by gk＠torproject.org 03 Dec '14

03 Dec '14

commit 25921b57878c273ea4f499eb88ac2590563d9869 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 3 11:38:34 2014 +0000 fixup! #13671: fix circuit display when bridges are used --- src/chrome/content/tor-circuit-display.js | 6 +++--- src/modules/tor-control-port.js | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index caf6886..4c31bc6 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -81,10 +81,10 @@ let readBridgeIPs = function (controller) { // nodeDataForID(controller, id)__. // Returns the type, IP and country code of a node with given ID. -// Example: `nodeData(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` -// => `{ type : "default" , ip : "12.23.34.45" , countryCode : "fr" }` +// Example: `nodeDataForID(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` +// => `{ type : "default", ip : "12.23.34.45", countryCode : "fr" }` let nodeDataForID = function* (controller, id) { - let result = {}; // ip, type, countryCode; + let result = {}; // type, ip, countryCode; if (bridgeIDtoIPmap.has(id.toUpperCase())) { result.ip = bridgeIDtoIPmap.get(id.toUpperCase()); result.type = "bridge"; diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index d356ebb..3fa7756 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -178,7 +178,7 @@ io.onLineFromOnMessage = function (onMessage) { // __io.callbackDispatcher()__. // Returns dispatcher object with three member functions: -// dispatcher.addCallback(regex, callback), and dispatcher.removeCallback(callback), +// dispatcher.addCallback(regex, callback), dispatcher.removeCallback(callback), // and dispatcher.pushMessage(message). // Pass pushMessage to another function that needs a callback with a single string // argument. Whenever dispatcher.pushMessage receives a string, the dispatcher will @@ -412,12 +412,12 @@ info.routerStatusParser = function (valueString) { dataFun = { "r" : data => utils.listMapData(data, ["nickname", "identity", "digest", "publicationDate", "publicationTime", - "IP", "ORPort", "DirPort"]) , - "a" : data => ({ "IPv6" : data }) , - "s" : data => ({ "statusFlags" : utils.splitAtSpaces(data) }) , - "v" : data => ({ "version" : data }) , - "w" : data => utils.listMapData(data, []) , - "p" : data => ({ "portList" : data.split(",") }) , + "IP", "ORPort", "DirPort"]), + "a" : data => ({ "IPv6" : data }), + "s" : data => ({ "statusFlags" : utils.splitAtSpaces(data) }), + "v" : data => ({ "version" : data }), + "w" : data => utils.listMapData(data, []), + "p" : data => ({ "portList" : data.split(",") }), "m" : data => utils.listMapData(data, []) }[line.charAt(0)]; if (dataFun !== undefined) {

1 0

[tor-browser-bundle/master] Correct NoScript hash.
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit b3cecd5a7b2e7e26731606e7b0824527e200c882 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 2 21:41:21 2014 +0000 Correct NoScript hash. --- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a25af43..4e6cead 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -86,7 +86,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701 +NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a HTTPSE_HASH=d97ec822641d4ebf404fee1179497e1d80f2b8344d5fa485169ef045ba184db0 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 2ba0141..2545121 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -87,7 +87,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701 +NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a HTTPSE_HASH=d97ec822641d4ebf404fee1179497e1d80f2b8344d5fa485169ef045ba184db0 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[torbutton/master] Bump Torbutton version; update CHANGELOG
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit 56c588b63a6f616b886333f6b8e997bcc2497371 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 2 20:29:01 2014 +0000 Bump Torbutton version; update CHANGELOG --- src/CHANGELOG | 9 +++++++++ src/install.rdf | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 4510b0c..5bc86c6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,12 @@ +1.8.1.2 + * Bug 13672: Make circuit display optional + * Bug 13671: Make bridges visible on circuit display + * Bug 9387: Incorporate user feedback + * Bug 13784: Remove third party authentication tokens + +1.8.1.1 + * Bug 13751: Remove remaining SafeCache code. + 1.8.1.0 * Bug 13746: Properly link Torbutton UI to thirdparty pref. * Bug 13742: Remove SafeCache code (in favor of C++ implementation) diff --git a/src/install.rdf b/src/install.rdf index 402b99c..ae524b2 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.1.0</em:version> + <em:version>1.8.1.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug 9387: Version 0.3 of the Security Slider.
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit 6f3904e16b829715b230d927f29d2cf02f1e4964 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 1 15:36:51 2014 +0000 Bug 9387: Version 0.3 of the Security Slider. It contains the following, small improvements: * custom settings are not overwritten on restart/New Identity * the custom checkbox is disabled and not hidden anymore by default * the security level can be chosen by clicking on the respective description --- src/chrome/content/preferences.js | 20 ++++++++++++-------- src/chrome/content/preferences.xul | 19 +++++++++++-------- src/chrome/content/torbutton.js | 9 ++++++--- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 20a6c9f..75937eb 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -194,7 +194,7 @@ function torbutton_prefs_init(doc) { // non-responding. We need to handle |movetoclick| as well. sec_slider.setAttribute("movetoclick", !custom_values); sec_custom.checked = custom_values; - sec_custom.collapsed = !custom_values; + sec_custom.disabled = !custom_values; torbutton_prefs_set_field_attributes(doc); } @@ -447,14 +447,18 @@ function torbutton_prefs_reset_defaults() { prefService.savePrefFile(null); } -function torbutton_toggle_slider(doc) { +function torbutton_toggle_slider(doc, pos) { let slider = doc.getElementById("torbutton_sec_slider"); - if (doc.getElementById("torbutton_sec_custom").checked) { - slider.disabled = true; - slider.setAttribute("movetoclick", false); + // onclick is active even if the element it belongs to is disabled. + if (pos && !slider.disabled) { + slider.value = pos; } else { - slider.disabled = false; - slider.setAttribute("movetoclick", true); + if (doc.getElementById("torbutton_sec_custom").checked) { + slider.disabled = true; + slider.setAttribute("movetoclick", false); + } else { + slider.disabled = false; + slider.setAttribute("movetoclick", true); + } } } - diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 7c5633b..cb5f1ab 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -97,7 +97,7 @@ <radiogroup align="center" orient="horizontal" id="torbutton_socksGroup"> <radio id="torbutton_socksv4" label="&torbutton.prefs.socks_vfour;"/> - <radio id="torbutton_socksv5" + <radio id="torbutton_socksv5" label="&torbutton.prefs.socks_vfive;"/> </radiogroup> </row> @@ -129,8 +129,7 @@ oncommand="torbutton_prefs_set_field_attributes(document)"/> </radiogroup> - - + <hbox> <spacer flex="1"/> <button id="torbutton_testSettings" @@ -162,22 +161,26 @@ </vbox> <vbox height="200"> <hbox flex="1" align="center"> - <description id="torbutton_sec_low"> + <description id="torbutton_sec_low" + onclick="torbutton_toggle_slider(document, 1);"> &torbutton.prefs.sec_low; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_med_low"> + <description id="torbutton_sec_med_low" + onclick="torbutton_toggle_slider(document, 2);"> &torbutton.prefs.sec_med_low; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_med_high"> + <description id="torbutton_sec_med_high" + onclick="torbutton_toggle_slider(document, 3);"> &torbutton.prefs.sec_med_high; </description> </hbox> <hbox flex="1" align="center"> - <description id="torbutton_sec_high"> + <description id="torbutton_sec_high" + onclick="torbutton_toggle_slider(document, 4);"> &torbutton.prefs.sec_high; </description> </hbox> @@ -185,7 +188,7 @@ </hbox> <hbox> <checkbox id="torbutton_sec_custom" flex="1" - oncommand="torbutton_toggle_slider(document);" + oncommand="torbutton_toggle_slider(document, 0);" label="&torbutton.prefs.sec_custom;"/> </hbox> </groupbox> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index da39864..2ba4159 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -552,8 +552,11 @@ function torbutton_init() { // initialize preferences before we start our prefs observer torbutton_init_prefs(); - // set some important security prefs according to the chosen security level - torbutton_update_security_slider(); + // Set some important security prefs according to the chosen security level + // if there are no custom settings to respect. + if (!m_tb_prefs.getBoolPref("extensions.torbutton.security_custom")) { + torbutton_update_security_slider(); + } // set panel style from preferences torbutton_set_panel_style(); @@ -562,7 +565,7 @@ function torbutton_init() { torbutton_init_toolbutton(); torbutton_log(1, 'registering pref observer'); - torbutton_window_pref_observer.register(); + torbutton_window_pref_observer.register(); torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register();

1 0

[torbutton/master] Revert "Bug 13742: Remove SafeCache code (in favor of C++ implementation)"
by gk＠torproject.org 02 Dec '14

02 Dec '14

commit 7b93a59893957db4495abe3541036c760ed119f9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 2 14:42:13 2014 +0000 Revert "Bug 13742: Remove SafeCache code (in favor of C++ implementation)" This reverts commit 1dedacb01855cab10835d165578575603a208cec. --- src/chrome/content/stanford-safecache.js | 448 ++++++++++++++++++++++++++++++ src/chrome/content/torbutton.xul | 4 + 2 files changed, 452 insertions(+) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js new file mode 100644 index 0000000..0ef52ad --- /dev/null +++ b/src/chrome/content/stanford-safecache.js @@ -0,0 +1,448 @@ +// Bug 1506 P3: This file provides important cache isolation properties, +// but it is not very useful without a patched Firefox to go with it. +// It could probably also use some refactoring into an XPCOM component. +// It is currently registered from torbutton.js's "main window" observers, +// which is not the right place. + +/* + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of Stanford University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +*/ +// Dual-keyed cache/cookie same-origin policy +// Ensures that cache and cookies set in HTTP headers cannot be used for +// non-cooperative or semi-cooperative tracking. +// +// Author: Edward Pastuszenski +// +// Based on Stanford SafeCache +// Author: Collin Jackson +// Other contributors: Andrew Bortz, John Mitchell, Dan Boneh +// + +////////////////////////////////////////////////////////////////////////////// +// Constants + +const kSSC_ENABLED_PREF = "extensions.torbutton.safecache"; +const kSSC_SC_ENABLED_PREF = "extensions.torbutton.dual_key_cookies"; +const kSSC_TORBUTTON_PREF = "extensions.torbutton.tor_enabled"; +const kSSC_COOKIE_JS_PREF = "extensions.torbutton.cookie_js_allow"; + +//////////////////////////////////////////////////////////////////////////// +// Debug stuff + +/** + * Dump information to the console? + */ +var SSC_debug = true; + +/** + * Sends data to the console if we're in debug mode + * @param msg The string containing the message to display + */ +function SSC_dump(msg) { + if (SSC_debug) + torbutton_log(3, "SSC: " + msg); +} + +//////////////////////////////////////////////////////////////////////////// +// "Major" objects/classes + +/** + * SafeCache HTTP Request Listener + * Watches for the authentication requests and presents password dialog + */ + +function SSC_RequestListener(controller) { + this.controller = controller; + this.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"]. + getService(Ci.mozIThirdPartyUtil); + this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"]. + getService(Ci.nsICookiePermission); +} + +SSC_RequestListener.prototype = +{ + controller: null, // The SSC_Controller that created this + + observe: function(subject, topic, data) { + try { + if(this.controller.getEnabled() == 2) return; + if(this.controller.getEnabled() == 1 + && !this.controller.getTorButton()) return; + if (topic == 'http-on-modify-request') { + subject.QueryInterface(Components.interfaces.nsIHttpChannel); + subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); + subject.QueryInterface(Components.interfaces.nsICachingChannel); + subject.QueryInterface(Components.interfaces.nsIChannel); + this.onModifyRequest(subject); + } else if (topic == 'http-on-examine-response') { + subject.QueryInterface(Components.interfaces.nsIHttpChannel); + subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); + subject.QueryInterface(Components.interfaces.nsICachingChannel); + subject.QueryInterface(Components.interfaces.nsIChannel); + this.onExamineResponse(subject); + } + } catch(e) {try {torbutton_log(4, "SSC: "+e);} catch(ex) {}} + }, + + bypassCache: function(channel) { + channel.loadFlags |= channel.LOAD_BYPASS_CACHE; + // INHIBIT_PERSISTENT_CACHING instead? + channel.cacheKey = this.newCacheKey(0); + SSC_dump("Bypassed cache for " + channel.URI.spec); + }, + + setCacheKey: function(channel, str) { + try { + channel.cacheDomain = str; + SSC_dump("Set cacheDomain to "+str+" for "+channel.URI.spec); + } catch(e) { + var oldData = this.readCacheKey(channel); + var newKey = this.newCacheKey(this.getHash(str) + oldData); + channel.cacheKey = newKey; + SSC_dump("Set cache key to hash(" + str + ") = " + + newKey.data + " for " + channel.URI.spec); + } + }, + + onModifyRequest: function(channel) { + var parent_host = null; + var parent_spec = null; + if (channel.notificationCallbacks || + channel.loadGroup && channel.loadGroup.notificationCallbacks) { + var callbacks = null; + if (channel.notificationCallbacks) { + callbacks = channel.notificationCallbacks; + } else { + callbacks = channel.loadGroup.notificationCallbacks; + } + try { + var wind = callbacks.QueryInterface( + Components.interfaces.nsIInterfaceRequestor).getInterface( + Components.interfaces.nsIDOMWindow); + parent_host = wind.window.top.location.hostname; + parent_spec = wind.window.top.location.href; + } catch(e) { + } + SSC_dump("Parent "+parent_host+" for "+ channel.URI.spec); + } + + if (channel.documentURI && channel.documentURI == channel.URI) { + parent_host = null; // first party interaction + parent_spec = null; + } else if(!parent_host) { + // Questionable first party interaction.. + try { + var anuri = null; + try { + anuri = this.thirdPartyUtil.getFirstPartyURIFromChannel(channel, false); + } catch (e) { + torbutton_safelog(2, "FirstParty API failed to get parent: "+e+" ", channel.URI.spec); + // We are not using the TBB based on ESR 24. Falling back to the old + // method. + anuri = this.cookie_permissions.getOriginatingURI(channel); + } + parent_host = anuri.host; + parent_spec = anuri.spec; + } catch(e) { + // XXX: This can still fail for OCSP and other windowless requests.. + torbutton_safelog(3, "Cookie API failed to get parent: "+e+" ",channel.URI.spec); + if (!channel.referrer) { + torbutton_safelog(3, "SSC: No cache isolation parent for ", channel.URI.spec); + } else { + parent_host = channel.referrer.host; + parent_spec = channel.referrer.spec; + } + } + } + + // Same-origin policy + var referrer; + if (parent_host && parent_host != channel.URI.host) { + SSC_dump("Segmenting " + channel.URI.spec + + " content loaded by " + parent_host); + this.setCacheKey(channel, parent_host); + referrer = parent_host; + try { + // Disable 3rd party http auth, but exempt the browser (for favicon loads) + // FIXME: Hrmm, this is just going to disable auth for 3rd party domains. + // It would be better if we could isolate the auth, but still + // allow it to be transmitted.. But I guess, who still uses http auth anyways? + if (channel.getRequestHeader("Authorization") !== null) { + if (parent_spec == "chrome://browser/content/browser.xul") { + torbutton_log(3, "Allowing auth for browser load of "+channel.URI.spec); + } else { + torbutton_safelog(4, "Removing 3rd party HTTP auth for url ", + channel.URI.spec+", parent: "+parent_spec); + channel.setRequestHeader("Authorization", null, false); + channel.setRequestHeader("Pragma", null, false); + channel.setRequestHeader("Cache-Control", null, false); + } + } + } catch (e) {} + } else { + referrer = channel.URI.host; + if(!this.readCacheKey(channel)) { + this.setCacheKey(channel, channel.URI.host); + } else { + SSC_dump("Existing cache key detected; leaving it unchanged."); + } + } + + if (this.controller.getBlockThirdPartyCache()) { + if(parent_host && parent_host != channel.URI.host) { + //SSC_dump("Third party cache blocked for " + channel.URI.spec + + //" content loaded by " + parent_host); + this.bypassCache(channel); + } + } + + var cookie = null; + if (this.controller.getSafeCookieEnabled()) { + try{ + cookie = channel.getRequestHeader("Cookie"); + //SSC_dump("Cookie: " + cookie); + } catch(e) {cookie = null;} + } + + if(cookie) { + //Strip the secondary key from every referrer-matched cookie + var newHeader = ""; + var i = 0; + var lastStart = 0; + //State 0: no information on next cookie + //State 1: cookie will be sent. + //State 2: cookie will not be sent. + var state = 0; + while (i < cookie.length) { + //Dual-keyed cookie + if(state == 0 && cookie.charAt(i) == '|'){ + //If referrers match, strip key and send cookie + var cookieReferrer = cookie.toString().substr(lastStart, i - lastStart); + if (referrer == cookieReferrer){ + lastStart = i+1; + state = 1; + } else { + state = 2; + } + } + //Single-keyed cookie that was set via scripting. + if (state == 0 && cookie.charAt(i) == '='){ + if(this.controller.getCookieJS()) state = 1; + else { + if (referrer == channel.getRequestHeader("Host")) state = 1; + else state = 2; + } + } + //End of a cookie + if (cookie.charAt(i) == ';') { + var thisCookie = cookie.toString().substr(lastStart, i - lastStart + 2); + if (state == 1){ + newHeader += thisCookie; + } + if (state == 2){ + SSC_dump("Declining to send " + thisCookie + + " for request by embedded domain " + channel.URI.host + + + " " + channel.getRequestHeader("Host") + + " on embedding page " + referrer); + } + lastStart = i+2; + state = 0; + } + //End of the string + if (i == cookie.length - 1){ + thisCookie = cookie.toString().substr(lastStart, i - lastStart + 1); + if (state == 1){ + newHeader += thisCookie; + } + if (state == 2){ + SSC_dump("Declining to send " + thisCookie + + " for request by embedded domain " + channel.URI.host + + + " " + channel.getRequestHeader("Host") + + " on embedding page " + referrer); + } + lastStart = i+1; + } + i++; + } + channel.setRequestHeader("Cookie", newHeader, false); + } + + }, + + onExamineResponse: function(channel) { + var setCookie; + try{ + setCookie = channel.getResponseHeader("Set-Cookie"); + } catch(e) {setCookie = null;} + + if(setCookie) { + var parent = null; + // XXX: need to use loadGroup here if null.. + if (channel.notificationCallbacks) { + var wind = channel.notificationCallbacks.QueryInterface( + Components.interfaces.nsIInterfaceRequestor).getInterface( + Components.interfaces.nsIDOMWindow); + parent = wind.window.top.location; + } + + if (channel.documentURI && channel.documentURI == channel.URI) { + parent = null; // first party interaction + } + + var referrer; + // Same-origin policy + if (parent && parent.hostname != channel.URI.host) { + //SSC_dump("Segmenting " + channel.URI.host + + //" content loaded by " + parent.host); + referrer = parent.hostname; + } else { + referrer = channel.URI.host; + } + //Dual-key each cookie set in the header + var newHeader = ""; + var i = 0; + var lastStart = 0; + //Some messy code that prevents multiple embedding-domain keys + //from being concatenated to cookie names. + var passedname = false; + var namebar = false; + while (i < setCookie.length) { + if (setCookie.charAt(i) == '=') passedname = true; + else if (setCookie.charAt(i) == '|' && passedname == false) + namebar = true; + if (i == setCookie.length - 1 || setCookie.charAt(i) == '\n'){ + if(!namebar){ + newHeader += referrer + "|" + + setCookie.toString().substr(lastStart, i - lastStart + 1); + } + lastStart = i+1; + passedname = false; + namebar = false; + } + i++; + } + //SSC_dump("MODIFIED Set-Cookie: " + newHeader); + channel.setResponseHeader("Set-Cookie", newHeader, false); + } + }, + + // Read the integer data contained in a cache key + readCacheKey: function(channel) { + try { + return channel.cacheDomain; + } catch(e) { + channel.cacheKey.QueryInterface(Components.interfaces.nsISupportsPRUint32); + return channel.cacheKey.data; + } + }, + + // Construct a new cache key with some integer data + newCacheKey: function(data) { + var cacheKey = + Components.classes["@mozilla.org/supports-PRUint32;1"] + .createInstance(Components.interfaces.nsISupportsPRUint32); + cacheKey.data = data; + return cacheKey; + }, + + strMD5: function(str) { + var converter = + Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]. + createInstance(Components.interfaces.nsIScriptableUnicodeConverter); + + // nsIURI.host is UTF-8 + converter.charset = "UTF-8"; + // result.value will contain the array length + var result = {}; + // data is an array of bytes + var data = converter.convertToByteArray(str, result); + var ch = Components.classes["@mozilla.org/security/hash;1"] + .createInstance(Components.interfaces.nsICryptoHash); + ch.init(ch.MD5); + ch.update(data, data.length); + return ch.finish(false); + }, + + // Get an integer hash of a string + getHash: function(str) { + var hash = this.strMD5(str); + var intHash = 0; + for(var i = 0; i < hash.length && i < 8; i++) + intHash += hash.charCodeAt(i) << (i << 3); + return intHash; + }, +} + +/** + * Master control object. Adds and removes the RequestListener + */ +function SSC_Controller() { + this.prefs = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefService); + this.addListener(new SSC_RequestListener(this)); +} + +SSC_Controller.prototype = { + + getEnabled: function() { + return (this.prefs.getIntPref(kSSC_ENABLED_PREF)); + }, + + getSafeCookieEnabled: function() { + return (this.prefs.getBoolPref(kSSC_SC_ENABLED_PREF)); + }, + + getBlockThirdPartyCache: function() { + // Meh, no pref for now. Always allow. + return false; + }, + + getTorButton: function() { + return (this.prefs.getBoolPref(kSSC_TORBUTTON_PREF)); + }, + + getCookieJS: function() { + return (this.prefs.getBoolPref(kSSC_COOKIE_JS_PREF)); + }, + + addListener: function(listener) { + this.listener = listener; + var observerService = + Components.classes["@mozilla.org/observer-service;1"] + .getService(Components.interfaces.nsIObserverService); + observerService.addObserver(listener, "http-on-modify-request", false); + // XXX: We need an observer to add this listener when the pref gets set + if (this.getSafeCookieEnabled()) { + observerService.addObserver(listener, "http-on-examine-response", false); + } + }, + + removeListener: function() { + var observerService = + Components.classes["@mozilla.org/observer-service;1"] + .getService(Components.interfaces.nsIObserverService); + observerService.removeObserver(this.listener, "http-on-modify-request"); + if (this.getSafeCookieEnabled()) { + observerService.removeObserver(this.listener, "http-on-examine-response"); + } + }, +} + +//////////////////////////////////////////////////////////////////////////// +// Global stuff +// "What script would be complete without a couple of globals?" --Fritz + +var SSC_controller; + +function SSC_startup() { + if(!SSC_controller) SSC_controller = new SSC_Controller(); + SSC_dump("Loaded controller"); +} diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index 95624f0..00dc6f0 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -6,6 +6,10 @@ <overlay id="torbutton-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + +  + <script src="chrome://torbutton/content/stanford-safecache.js" /> + <script type="application/x-javascript" src="chrome://torbutton/content/torbutton_util.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/tor-circuit-display.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/torbutton.js" />

1 0