- tbb-commits - lists.torproject.org

[tor-launcher/master] Bump version to 0.2.7.4.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 360f70048a5e2338c52112a6507ee220ea330866 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:58:25 2015 -0700 Bump version to 0.2.7.4. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index c27be00..b2ca19c 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.3</em:version> + <em:version>0.2.7.4</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-launcher/master] Update translations.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 1be49192e9d29f2b541f723068c3c7cb986ccbd5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:56:40 2015 -0700 Update translations. --- src/chrome/locale/bg/network-settings.dtd | 6 ++-- src/chrome/locale/ca/network-settings.dtd | 2 +- src/chrome/locale/ca/progress.dtd | 2 +- src/chrome/locale/cs/network-settings.dtd | 8 ++--- src/chrome/locale/eu/network-settings.dtd | 8 ++--- src/chrome/locale/id/network-settings.dtd | 8 ++--- src/chrome/locale/lv/network-settings.dtd | 8 ++--- src/chrome/locale/sr/network-settings.dtd | 2 +- src/chrome/locale/sr(a)latin/network-settings.dtd | 34 ++++++++++----------- src/chrome/locale/sr(a)latin/torlauncher.properties | 4 +-- src/chrome/locale/zh-CN/network-settings.dtd | 4 +-- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 3813505..6b1c255 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -9,7 +9,7 @@ <!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> <!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана или минава през proxy сървър."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурирам bridge или proxy настройки."> <!ENTITY torSettings.configure "Конфигурирай"> <!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> <!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> @@ -17,7 +17,7 @@ <!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 local proxy."> +<!ENTITY torSettings.proxyHelp "Ако не сте сигурни как да отговорите на този въпрос проверете интернет настройките на друг браузър,за да видите дали е настроен да използва прокси."> <!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> <!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> <!ENTITY torSettings.bridgeHelp "Ако не сте сигурни как да отговорите на този въпрос, изберете No.  Ако изберете Yes, вие ще бъдете помолен да конфигурирате Tor Bridges, непубликувани relays които правят блокирането на връзката към Tor Network по трудна."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Допълнителен"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Необходимо е използването на локален прокси сървър за достъп до Интернет"> <!ENTITY torsettings.useProxy.type "Прокси Тип:"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или хост"> diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index a8996f7..7bf1ca5 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Configuració Xarxa Tor"> +<!ENTITY torsettings.dialog.title "Configuració de la Xarxa Tor">  diff --git a/src/chrome/locale/ca/progress.dtd b/src/chrome/locale/ca/progress.dtd index 18b34e0..cb62f1b 100644 --- a/src/chrome/locale/ca/progress.dtd +++ b/src/chrome/locale/ca/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Estat del Tor"> +<!ENTITY torprogress.dialog.title "Estat de Tor"> <!ENTITY torprogress.openSettings "Obrir preferències."> <!ENTITY torprogress.heading "S'està connectant a la xarxa Tor"> <!ENTITY torprogress.pleaseWait "Si us plau, espereu mentre establim una connexió a la xarxa Tor."> diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index ad8842d..7554d91 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "Která možnost nejlépe popisuje Vaši situaci?"> <!ENTITY torSettings.configurePrompt1 "Připojení k internetu u tohoto pořítače je cenzorováno nebo proxováno."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Potřebuji nastavit most, nebo lokální nastavení proxy."> <!ENTITY torSettings.configure "Konfigurovat"> <!ENTITY torSettings.connectPrompt2 "Chtěl bych se přímo připojit k Tor síti."> <!ENTITY torSettings.connectPrompt3 "Toto bude fungovat ve většině případů."> <!ENTITY torSettings.connect "Připojit"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Potřebuje tento počítač zapnutí lokální proxy, aby se připojil k internetu?">  -<!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 local proxy."> +<!ENTITY torSettings.proxyHelp "Pokud nevíte, jak odpovědět, podívejte se na nastavení sítě Internet v jiném prohlížeči, abyste zjistili, zda je nakonfigurován k používání proxy."> <!ENTITY torSettings.enterProxy "Zadejte nastavení serveru proxy."> <!ENTITY torSettings.bridgeQuestion "Blokuje nebo jinak cenzuruje váš poskytovatel internetového připojení (ISP) spojení se sítí TORu?"> <!ENTITY torSettings.bridgeHelp "Pokud si nejste jistí jak odpovědět na tuto otázku, zvolte No.  Pokud vyberete Ano, budete vyzváni k nastavení Mostů TORu, což jsou přenašeče neuvedené v seznamu, které dělají blokování spojení se sítí TORu složitější."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Volitelný"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Tento počítač potřebuje použití proxy, aby se připojil k internetu."> <!ENTITY torsettings.useProxy.type "Typ Proxy:"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo jméno hosta"> diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index c6da9ae..e96f95c 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?"> <!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta dago edo proxy batetik igarotzen da."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Zubi edo proxy lokalaren 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."> <!ENTITY torSettings.connect "Konektatu"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Ordenagailu honek Internetera sartzeko proxy lokalen bat erabili behar al du?">  -<!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 local proxy."> +<!ENTITY torSettings.proxyHelp "Galdera hau nola erantzuteaz zalantzan bazaude, begiratu beste nabigatzaile batean Interneteko ezarpenak proxy lokal bat erabiltzeko konfiguratuta dagoen ikusteko."> <!ENTITY torSettings.enterProxy "Sartu proxy ezarpenak."> <!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."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Hautazkoa"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Ordenagailu honek proxy lokal bat erabili behar du Internetera sartzeko"> <!ENTITY torsettings.useProxy.type "Proxy mota:"> <!ENTITY torsettings.useProxy.address "Helbidea:"> <!ENTITY torsettings.useProxy.address.placeholder "IP helbide edo ostalari izena"> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index 428626b..2033052 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Opsional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Komputer ini perlu menggunakan proxy lokal untuk mengakses internet"> <!ENTITY torsettings.useProxy.type "Tipe Proxy:"> <!ENTITY torsettings.useProxy.address "Alamat:"> <!ENTITY torsettings.useProxy.address.placeholder "alamat IP atau nama host"> @@ -54,9 +54,9 @@ <!ENTITY torsettings.bridgeHelp1 "Jika Anda tidak dapat terhubung ke jaringan Tor, bisa jadi Provider Layanan Internet (ISP) atau lembaga lain yang menghalangi Tor.   Sering kali, Anda dapat mengatasi masalah ini dengan menggunakan Tor Bridges, yang relai terdaftar yang lebih sulit untuk memblokir."> <!ENTITY torsettings.bridgeHelp1B "Anda dapat menggunakan prekonfigurasi, disediakan alamat set bridge atau Anda mungkin mendapatkan satu set kebiasaan alamat dengan menggunakan salah satu dari tiga metode ini:"> <!ENTITY torsettings.bridgeHelp2Heading "Lewat web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp2 "Menggunakan applikasi penjelajah interet untuk mengunjungi https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Melalui 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, atau https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4Heading "Melalui 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/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index 94ab0a3..a08b592 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "Kura situācija vislabāk atbilst jūsējai?"> <!ENTITY torSettings.configurePrompt1 "Datora savienojums ar internetu ir cenzēts vai starpniekots."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Man jānokonfigurē tiltu vai lokālo 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."> <!ENTITY torSettings.connect "Veidot savienojumu"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Vai šim datoram jāizmanto lokālais starpniekserveris, lai piekļūtu internetam?">  -<!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 local proxy."> +<!ENTITY torSettings.proxyHelp "Ja neesat pārliecināts par atbildi uz šo jautājumu, apskatiet cita pārlūka interneta iestatījumus, lai redzētu vai pārlūks ir nokonfigurēts lokāla starpniekservera izmantošanai. "> <!ENTITY torSettings.enterProxy "Ievadiet starpnieka iestatījumus."> <!ENTITY torSettings.bridgeQuestion "Vai Jūsu interneta pakalpojumu sniedzējs (ISP) bloķē vai savādāk cenzē savienojumus ar tīklu Tor?"> <!ENTITY torSettings.bridgeHelp "Ja nezināt atbildi, izvēlieties No.  ja izvēlēsities Jā, Jums lūgs konfigurēt Tor tiltus jeb Tor Bridges, proti, neuzskaitītus retranslatorus, kuri apgrūtina savienojumu bloķēšanu ar tīklu Tor."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Neobligāts"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Šajā datorā interneta piekļuvei ir jāizmanto lokālais starpniekserveris."> <!ENTITY torsettings.useProxy.type "Starpnieka tips:"> <!ENTITY torsettings.useProxy.address "Adrese:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adrese vai resursdatora nosaukums"> diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index 4c14d3d..c9f028b 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.connectPrompt3 "Ово ће радити у већини ситуација."> <!ENTITY torSettings.connect "Повежи се"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Da li ovaj kompjuter koristi lokalni proksi kao pristup internetu?">  <!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 local proxy."> <!ENTITY torSettings.enterProxy "Унесите proxy подешавања."> diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index ec16b2b..5f9422f 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -1,24 +1,24 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Podešavanja Tor mreže">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Pre nego što se konektujete na Tor mrežu, potrebno je da pružite informacije o internet konekciji ovog kompjutera."> <!ENTITY torSettings.yes "Da"> <!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Koji od ponuđenih najbolje opisuje vašu situaciju?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local 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.configure "Konfiguriši"> +<!ENTITY torSettings.connectPrompt2 "Želim da se direktno povežem na Tor mrežu."> +<!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> +<!ENTITY torSettings.connect "Povezivanje"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Da li ovaj kompjuter koristi lokalni proksi za pristup internetu?">  <!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 local proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.enterProxy "Unesite vaša proksi podešavanja."> <!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."> @@ -26,22 +26,22 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Restartovanje Tor-a"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Opciono"> <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Korisničko ime:"> <!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.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.firewall.allowedPorts "Dozvoljeni portovi: "> <!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:"> diff --git a/src/chrome/locale/sr(a)latin/torlauncher.properties b/src/chrome/locale/sr(a)latin/torlauncher.properties index 02be756..a5e87ea 100644 --- a/src/chrome/locale/sr(a)latin/torlauncher.properties +++ b/src/chrome/locale/sr(a)latin/torlauncher.properties @@ -29,8 +29,8 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor +torlauncher.connect=Povezivanje +torlauncher.restart_tor=Restartovanje Tor-a torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 4e6d5e1..37e815e 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -47,9 +47,9 @@ <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> -<!ENTITY torsettings.useBridges.placeholder "输入地址:端口"> +<!ENTITY torsettings.useBridges.placeholder "类型地址:端口"> -<!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板"> +<!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> <!ENTITY torsettings.bridgeHelp1 "如果 Tor 网络无法连接，可能是因为互联网服务提供商 (ISP) 或其他机构对 Tor 进行了封锁。通常，使用 Tor 网桥可以解决这种问题。网桥指未公开的网络中继，更难于封锁。"> <!ENTITY torsettings.bridgeHelp1B "你可以使用本软件集成的一组网桥，也可以通过以下三种方法获取网桥。">

1 0

[tor-browser-bundle/master] Update changelog for bug 15502.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 44c07072325b31478b06a874d700d518389932f4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:46:08 2015 -0700 Update changelog for bug 15502. --- 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 bbd4bd8..7e4b01c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -22,6 +22,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism * Bug 14716: Fix issues with HTTP Auth usage and TLS connection info display + * Bug 15502: Isolate blob URI scope to URL domain; block WebWorker access * Bug 15562: Disable Javascript SharedWorkers due to third party tracking * Bug 15757: Disable Mozilla video statistics API extensions * Bug 15758: Disable Device Sensor APIs

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'arthur/15502+8' into tor-browser-31.6.0esr-4.5-1
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 71adcfc9a5adf7aeeed0dfa2719ccd59cc84881e Merge: 89bd8f1 f4f2caa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 18:05:08 2015 -0700 Merge remote-tracking branch 'arthur/15502+8' into tor-browser-31.6.0esr-4.5-1 content/base/src/ThirdPartyUtil.cpp | 9 ++ content/base/src/nsHostObjectProtocolHandler.cpp | 23 ++++- content/base/test/bug15502_page_blobify.html | 26 ++++++ content/base/test/bug15502_page_deblobify.html | 31 +++++++ content/base/test/bug15502_tab.html | 39 ++++++++ content/base/test/bug15502_utils.js | 104 ++++++++++++++++++++++ content/base/test/bug15502_worker_blobify.html | 28 ++++++ content/base/test/bug15502_worker_blobify.js | 12 +++ content/base/test/bug15502_worker_deblobify.html | 30 +++++++ content/base/test/bug15502_worker_deblobify.js | 24 +++++ content/base/test/mochitest.ini | 9 ++ content/base/test/test_tor_bug15502.html | 92 +++++++++++++++++++ dom/workers/URL.cpp | 7 ++ netwerk/base/public/mozIThirdPartyUtil.idl | 15 ++++ 14 files changed, 447 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug #15502, Part 2: Regression tests for blob URL isolation
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit f4f2caa26dd2d15e8f99d0a1357361da43e4fd2f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Apr 18 17:37:21 2015 -0700 Bug #15502, Part 2: Regression tests for blob URL isolation --- content/base/test/bug15502_page_blobify.html | 26 ++++++ content/base/test/bug15502_page_deblobify.html | 31 +++++++ content/base/test/bug15502_tab.html | 39 ++++++++ content/base/test/bug15502_utils.js | 104 ++++++++++++++++++++++ content/base/test/bug15502_worker_blobify.html | 28 ++++++ content/base/test/bug15502_worker_blobify.js | 12 +++ content/base/test/bug15502_worker_deblobify.html | 30 +++++++ content/base/test/bug15502_worker_deblobify.js | 24 +++++ content/base/test/mochitest.ini | 9 ++ content/base/test/test_tor_bug15502.html | 92 +++++++++++++++++++ 10 files changed, 395 insertions(+) diff --git a/content/base/test/bug15502_page_blobify.html b/content/base/test/bug15502_page_blobify.html new file mode 100644 index 0000000..d883929 --- /dev/null +++ b/content/base/test/bug15502_page_blobify.html @@ -0,0 +1,26 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Page blobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let message = yield receiveMessage(window.parent), + blobURL = stringToBlobURL(message); + sendMessage(window.parent, blobURL); + appendLine("display", message + " -> " + blobURL); +}); + +</script> +</body> +</html> diff --git a/content/base/test/bug15502_page_deblobify.html b/content/base/test/bug15502_page_deblobify.html new file mode 100644 index 0000000..e8cbd51 --- /dev/null +++ b/content/base/test/bug15502_page_deblobify.html @@ -0,0 +1,31 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Page deblobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let blobURL = yield receiveMessage(window.parent), + string; + try { + string = yield blobURLtoString(blobURL); + } catch (e) { + string = e.message; + } + sendMessage(window.parent, string); + appendLine("display", blobURL + " -> " + string); +}); + +</script> +</body> +</html> diff --git a/content/base/test/bug15502_tab.html b/content/base/test/bug15502_tab.html new file mode 100644 index 0000000..7bd4744 --- /dev/null +++ b/content/base/test/bug15502_tab.html @@ -0,0 +1,39 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Tab for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> + +<div id="display"></div> +<iframe id="child" width="100%"></iframe> + +<script type="text/javascript;version=1.7"> + +let iframe = document.getElementById("child"); + +let connect = function (sourceObject, destinationObject) { + Task.spawn(function* () { + for (;;) { + let message = yield receiveMessage(sourceObject); + sendMessage(destinationObject, message); + } + }); +}; + +Task.spawn(function* () { + sendMessage(window.opener, "ready"); + let firstParentMessage = yield receiveMessage(window.opener); + iframe.src = firstParentMessage; + connect(window.opener, iframe.contentWindow); + connect(iframe.contentWindow, window.opener); +}); +</script> + +</body> +</html> diff --git a/content/base/test/bug15502_utils.js b/content/base/test/bug15502_utils.js new file mode 100644 index 0000000..9d69c12 --- /dev/null +++ b/content/base/test/bug15502_utils.js @@ -0,0 +1,104 @@ +// Import Task.jsm +let { Task } = SpecialPowers.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); + setTimeout(() => reject(new Error("Timed out")), timeoutMs); + }); +}; + +// __receiveMessage(source)__. +// Returns an event object for the next message received from source. +// A Task.jsm coroutine. +let receiveMessage = function* (source) { + let event; + do { + event = yield listen(self, "message", 5000, false); + } while (event.source !== source); + return event.data; +}; + +// __sendMessage(destination, message)__. +// Sends a message to destination. +let sendMessage = function (destination, message) { + destination.postMessage(message, "*"); +}; + +// __appendLine(id, lineString)__. +// Add a line of text to the innerHTML of element with id. +let appendLine = function (id, lineString) { + document.getElementById(id).innerHTML += lineString + "\n"; +}; + +// __xhr(method, url, responseType__. +// A simple async XMLHttpRequest call. +// Returns a promise with the response. +let xhr = function (method, url, responseType) { + return new Promise(function (resolve, reject) { + let xhr = new XMLHttpRequest(); + xhr.open(method, url, true); + xhr.onload = function () { + resolve(xhr.response); + }; + xhr.responseType = responseType; + xhr.send(); + }); +}; + +// __blobURLtoBlob(blobURL)__. +// Asynchronously retrieves a blob object +// from a blob URL. Returns a promise. +let blobURLtoBlob = function (blobURL) { + return xhr("GET", blobURL, "blob"); +}; + +// __blobToString(blob)__. +// Asynchronously reads the contents +// of a blob object into a string. Returns a promise. +let blobToString = function (blob) { + return new Promise(function (resolve, reject) { + let fileReader = new FileReader(); + fileReader.onload = function () { + resolve(fileReader.result); + }; + fileReader.readAsText(blob); + }); +}; + +// __blobURLtoString(blobURL)__. +// Asynchronous coroutine that takes a blobURL +// and returns the contents in a string. +let blobURLtoString = function* (blobURL) { + let blob = yield blobURLtoBlob(blobURL); + return yield blobToString(blob); +}; + +// __stringToBlobURL(s)__. +// Converts string s into a blob, and returns +// a blob URL. +let stringToBlobURL = function (s) { + let blob = new Blob([s]); + return URL.createObjectURL(blob); +}; + +// __workerIO(scriptFile, inputString)__. +// Sends inputString for the worker, and waits +// for the worker to return an outputString. +// Task.jsm coroutine. +let workerIO = function* (scriptFile, inputString) { + let worker = new Worker(scriptFile); + worker.postMessage(inputString); + let result = yield listen(worker, "message", 5000, false); + worker.terminate(); + return result.data; +}; diff --git a/content/base/test/bug15502_worker_blobify.html b/content/base/test/bug15502_worker_blobify.html new file mode 100644 index 0000000..3dd7926 --- /dev/null +++ b/content/base/test/bug15502_worker_blobify.html @@ -0,0 +1,28 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Worker blobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<pre id="test"> +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let message = yield receiveMessage(window.parent), + blobURL = yield workerIO("bug15502_worker_blobify.js", message); + sendMessage(window.parent, blobURL); + appendLine("display", message + " -> " + blobURL); +}); + +</script> +</pre> +</body> +</html> diff --git a/content/base/test/bug15502_worker_blobify.js b/content/base/test/bug15502_worker_blobify.js new file mode 100644 index 0000000..4aef347 --- /dev/null +++ b/content/base/test/bug15502_worker_blobify.js @@ -0,0 +1,12 @@ +// Wait for a string to be posted to this worker. +// Create a blob containing this string, and then +// post back a blob URL pointing to the blob. +self.addEventListener("message", function (e) { + try { + var blob = new Blob([e.data]), + blobURL = URL.createObjectURL(blob); + postMessage(blobURL); + } catch (e) { + postMessage(e.message); + } +}, false); diff --git a/content/base/test/bug15502_worker_deblobify.html b/content/base/test/bug15502_worker_deblobify.html new file mode 100644 index 0000000..30ec6b4 --- /dev/null +++ b/content/base/test/bug15502_worker_deblobify.html @@ -0,0 +1,30 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Worker deblobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<pre id="test"> +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let blobURL = yield receiveMessage(window.parent), + result = yield workerIO("bug15502_worker_deblobify.js", blobURL); + sendMessage(window.parent, result); + appendLine("display", blobURL + " -> " + result); +}); + + + +</script> +</pre> +</body> +</html> diff --git a/content/base/test/bug15502_worker_deblobify.js b/content/base/test/bug15502_worker_deblobify.js new file mode 100644 index 0000000..8556311 --- /dev/null +++ b/content/base/test/bug15502_worker_deblobify.js @@ -0,0 +1,24 @@ +// Wait for a blob URL to be posted to this worker. +// Obtain the blob, and read the string contained in it. +// Post back the string. + +var postStringInBlob = function (blobObject) { + var fileReader = new FileReaderSync(), + result = fileReader.readAsText(blobObject); + postMessage(result); +}; + +self.addEventListener("message", function (e) { + var blobURL = e.data, + xhr = new XMLHttpRequest(); + try { + xhr.open("GET", blobURL, true); + xhr.onload = function () { + postStringInBlob(xhr.response); + }; + xhr.responseType = "blob"; + xhr.send(); + } catch (e) { + postMessage(e.message); + } +}, false); diff --git a/content/base/test/mochitest.ini b/content/base/test/mochitest.ini index c3cffb3..e59a70a 100644 --- a/content/base/test/mochitest.ini +++ b/content/base/test/mochitest.ini @@ -12,6 +12,14 @@ support-files = badMessageEvent.eventsource^headers^ badMessageEvent2.eventsource badMessageEvent2.eventsource^headers^ + bug15502_page_blobify.html + bug15502_page_deblobify.html + bug15502_tab.html + bug15502_utils.js + bug15502_worker_blobify.js + bug15502_worker_blobify.html + bug15502_worker_deblobify.js + bug15502_worker_deblobify.html bug282547.sjs bug298064-subframe.html bug313646.txt @@ -604,6 +612,7 @@ skip-if = toolkit == 'android' || e10s #RANDOM [test_textnode_normalize_in_selection.html] [test_textnode_split_in_selection.html] [test_title.html] +[test_tor_bug15502.html] [test_treewalker_nextsibling.xml] [test_viewport_scroll.html] [test_viewsource_forbidden_in_object.html] diff --git a/content/base/test/test_tor_bug15502.html b/content/base/test/test_tor_bug15502.html new file mode 100644 index 0000000..9ed3d70 --- /dev/null +++ b/content/base/test/test_tor_bug15502.html @@ -0,0 +1,92 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Test for Tor Browser Bug 15502</title> + <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> +</head> +<body> +<p id="display"></p> +<div id="content"></div> + +<script class="testbody" type="application/javascript;version=1.7"> +SimpleTest.waitForExplicitFinish(); + +// __prefs__. Import the `Serivces.prefs` object. +let prefs = SpecialPowers.Cu.import("resource://gre/modules/Services.jsm").Services.prefs; + +// ## Testing constants +let domain1 = "http://example.com", + domain2 = "http://example.net", + path = "/tests/content/base/test/", + page_blob = "bug15502_page_blobify.html", + page_deblob = "bug15502_page_deblobify.html" + worker_blob = "bug15502_worker_blobify.html", + worker_deblob = "bug15502_worker_deblobify.html"; + +// __tabIO(domain, child, input)__. +// Open a tab at the given `domain` and `child` page. Post an +// `input` message to the tab. +let tabIO = function* (domain, child, input) { + tab = window.open(domain + path + "bug15502_tab.html", "_blank"); + yield receiveMessage(tab); // ready message + sendMessage(tab, "http://example.org" + path + child); + yield receiveMessage(tab); // ready message + sendMessage(tab, input); + return yield receiveMessage(tab); +}; + +// __blobTest(isolationOn, domainA, domainB, blobPage, deblobPage)__. +// Run a test where we set the pref "privacy.thirdparty.isolate` to on or off, +// and then create a blob URL in `domainA`, using the page `blobPage`, +// and then attempt to retrieve the object from the blobURL in `domainB`, using +// the page `deblobPage`. +let blobTest = function* (isolationOn, domainA, domainB, blobPage, deblobPage) { + prefs.setIntPref("privacy.thirdparty.isolate", isolationOn ? 2 : 0); + let input = "" + Math.random(), + blobURL = yield tabIO(domainA, blobPage, input), + result = yield tabIO(domainB, deblobPage, blobURL), + description = domainA + ":" + blobPage + "->" + domainB + ":" + deblobPage + ", isolation " + (isolationOn ? "on." : "off."); + if (blobPage === worker_blob) { + // Remove this case when we write a patch that properly isolates web worker blob URLs + // by first party domain. + ok(blobURL.contains("Permission to call 'URL.createObjectURL' denied."), description + " Deny blob URL creation in web worker"); + } else if (deblobPage === worker_deblob && isolationOn) { + // Remove this case when we write a patch that properly isolates web worker blob URLs + // by first party domain. + ok(result.contains("Access to restricted URI denied"), description + " Isolated blobs not available to web workers"); + } else { + if (isolationOn && domainA !== domainB) { + ok(input !== result, description + " Deny retrieval"); + } else { + ok(input === result, description + " Allow retrieval"); + } + } +}; + + +// ## The main test +// Run a Task.jsm coroutine that tests various combinations of domains +// methods, and isolation states for reading and writing blob URLs. +Task.spawn(function* () { + for (let isolate of [false, true]) { + for (let domainB of [domain1, domain2]) { + for (let blob of [page_blob, worker_blob]) { + for (let deblob of [page_deblob, worker_deblob]) { + yield blobTest(isolate, domain1, domainB, blob, deblob); + } + } + } + } + SimpleTest.finish(); +}); + +</script> + +</body> +</html>

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 0d67ab406bdd3cf095802cb25c081641aa1f0bcc Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Apr 12 13:47:55 2015 -0700 Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers --- content/base/src/ThirdPartyUtil.cpp | 9 +++++++++ content/base/src/nsHostObjectProtocolHandler.cpp | 23 ++++++++++++++++++++-- dom/workers/URL.cpp | 7 +++++++ netwerk/base/public/mozIThirdPartyUtil.idl | 15 ++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index 695392f..0e037d1 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -635,3 +635,12 @@ ThirdPartyUtil::GetFirstPartyHostForIsolation(nsIURI *aFirstPartyURI, aHost.Append("--"); return NS_OK; } + +NS_IMETHODIMP +ThirdPartyUtil::GetFirstPartyHostFromCaller(nsACString& aHost) { + nsCOMPtr<nsIURI> uri; + nsresult rv = GetFirstPartyIsolationURI(nullptr, + nsContentUtils::GetDocumentFromCaller(), getter_AddRefs(uri)); + NS_ENSURE_SUCCESS(rv, rv); + return GetFirstPartyHostForIsolation(uri, aHost); +} diff --git a/content/base/src/nsHostObjectProtocolHandler.cpp b/content/base/src/nsHostObjectProtocolHandler.cpp index 10ec44c..e578804 100644 --- a/content/base/src/nsHostObjectProtocolHandler.cpp +++ b/content/base/src/nsHostObjectProtocolHandler.cpp @@ -15,6 +15,7 @@ #include "mozilla/dom/MediaSource.h" #include "nsIMemoryReporter.h" #include "mozilla/Preferences.h" +#include "mozIThirdPartyUtil.h" // ----------------------------------------------------------------------- // Hash table @@ -24,9 +25,20 @@ struct DataInfo nsCOMPtr<nsISupports> mObject; nsCOMPtr<nsIPrincipal> mPrincipal; nsCString mStack; + nsCString mFirstPartyHost; }; static nsClassHashtable<nsCStringHashKey, DataInfo>* gDataTable; +static nsCOMPtr<mozIThirdPartyUtil> gThirdPartyUtilService; + +static nsCString GetFirstPartyHostFromCaller() { + if (!gThirdPartyUtilService) { + gThirdPartyUtilService = do_GetService(THIRDPARTYUTIL_CONTRACTID); + } + nsCString host; + gThirdPartyUtilService->GetFirstPartyHostFromCaller(host); + return host; +} // Memory reporting for the hash table. namespace mozilla { @@ -290,6 +302,8 @@ nsHostObjectProtocolHandler::AddDataEntry(const nsACString& aScheme, info->mObject = aObject; info->mPrincipal = aPrincipal; + // Record the first party host that originated this object. + info->mFirstPartyHost = GetFirstPartyHostFromCaller(); mozilla::BlobURLsReporter::GetJSStackForBlob(info); gDataTable->Put(aUri, info); @@ -401,7 +415,10 @@ GetDataObject(nsIURI* aURI) aURI->GetSpec(spec); DataInfo* info = GetDataInfo(spec); - return info ? info->mObject : nullptr; + // Deny access to this object if the current first-party host + // doesn't match the originating first-party host. + return (info && info->mFirstPartyHost == GetFirstPartyHostFromCaller()) + ? info->mObject : nullptr; } // ----------------------------------------------------------------------- @@ -457,7 +474,9 @@ nsHostObjectProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result) DataInfo* info = GetDataInfo(spec); - if (!info) { + // Deny access to this URI if the current first party host + // doesn't match the first party host when it was created. + if (!info || (info->mFirstPartyHost != GetFirstPartyHostFromCaller())) { return NS_ERROR_DOM_BAD_URI; } nsCOMPtr<nsIDOMBlob> blob = do_QueryInterface(info->mObject); diff --git a/dom/workers/URL.cpp b/dom/workers/URL.cpp index f80594e..d52e4c6 100644 --- a/dom/workers/URL.cpp +++ b/dom/workers/URL.cpp @@ -894,6 +894,13 @@ URL::CreateObjectURL(const GlobalObject& aGlobal, JSObject* aBlob, JSContext* cx = aGlobal.GetContext(); WorkerPrivate* workerPrivate = GetWorkerPrivateFromContext(cx); + if (!workerPrivate->IsChromeWorker()) { + workerPrivate->ReportError(cx, "Worker attempted to use createObjectURL; denied.", nullptr); + NS_NAMED_LITERAL_STRING(argStr, "URL.createObjectURL"); + aRv.ThrowTypeError(MSG_METHOD_THIS_UNWRAPPING_DENIED, &argStr); + return; + } + nsCOMPtr<nsIDOMBlob> blob = file::GetDOMBlobFromJSObject(aBlob); if (!blob) { SetDOMStringToNull(aResult); diff --git a/netwerk/base/public/mozIThirdPartyUtil.idl b/netwerk/base/public/mozIThirdPartyUtil.idl index 0bb632b..0b0f410 100644 --- a/netwerk/base/public/mozIThirdPartyUtil.idl +++ b/netwerk/base/public/mozIThirdPartyUtil.idl @@ -246,6 +246,21 @@ interface mozIThirdPartyUtil : nsISupports * for which we generate a pseudo host. */ AUTF8String getFirstPartyHostForIsolation(in nsIURI aFirstPartyURI); + + /** + * getFirstPartyHostFromCaller + * + * Obtain the host or pseudo-host for the first party URI belonging + * to the calling document. See getFirstPartyHostForIsolation(...) for + * examples. + * + * @return host or pseudo host. + * + * @throws if the calling document's first party URI lacks a host + * and the scheme is not a whitelisted one for which we + * generate a pseudo host. + */ + AUTF8String getFirstPartyHostFromCaller(); }; %{ C++

1 0

[tor-browser-bundle/master] Update changelog for bugs 15757 and 15758.
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit 1e294bc7704cf6daf7b83aa54985ab5c78a11d28 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 15:31:31 2015 -0700 Update changelog for bugs 15757 and 15758. --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 70fe201..bbd4bd8 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -23,6 +23,8 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism * Bug 14716: Fix issues with HTTP Auth usage and TLS connection info display * Bug 15562: Disable Javascript SharedWorkers due to third party tracking + * Bug 15757: Disable Mozilla video statistics API extensions + * Bug 15758: Disable Device Sensor APIs * Linux * Bug 15747: Improve start-tor-browser argument handling * Bug 15672: Provide desktop app registration+unregistration for Linux

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_15757' into tor-browser-31.6.0esr-4.5-1
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit ab48482bd24a4389a3db2438be807dc303ca2933 Merge: f0fe46b 8dff562 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 15:28:28 2015 -0700 Merge remote-tracking branch 'gk/bug_15757' into tor-browser-31.6.0esr-4.5-1 browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_15758' into tor-browser-31.6.0esr-4.5-1
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit 89bd8f1c5b3e58dfbf9cf33692abfb2be78cd6cf Merge: ab48482 844949e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 15:29:02 2015 -0700 Merge remote-tracking branch 'gk/bug_15758' into tor-browser-31.6.0esr-4.5-1 Conflicts: browser/app/profile/000-tor-browser.js browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --cc browser/app/profile/000-tor-browser.js index 7967db1,a277e9d..e7e4ca9 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@@ -87,8 -87,8 +87,10 @@@ pref("javascript.use_us_english_locale" // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton +// Disable video statistics fingerprinting vector (bug 15757) +pref("media.video_stats.enabled", false); + // Disable device sensors as possible fingerprinting vector (bug 15758) + pref("device.sensors.enabled", false); // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

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

21 Apr '15

commit 8dff562d0af91529afee439af9ea5e7bb33d58f8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 21 13:20:57 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 192159b..7967db1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -87,6 +87,8 @@ pref("javascript.use_us_english_locale", true); // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton +// Disable video statistics fingerprinting vector (bug 15757) +pref("media.video_stats.enabled", false); // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0