September 2012 - tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 08 Sep '12

08 Sep '12

commit 766fbbfed3ef21fc28fe333b8782b90fd44e2032 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 8 12:45:04 2012 +0000 Update translations for gettor --- ro/gettor.po | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ro/gettor.po b/ro/gettor.po index df6b1d5..394f51e 100644 --- a/ro/gettor.po +++ b/ro/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-09-08 12:14+0000\n" +"PO-Revision-Date: 2012-09-08 12:45+0000\n" "Last-Translator: chen <moauuka(a)yahoo.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -141,7 +141,7 @@ msgid "" " \n" " windows\n" " split" -msgstr "" +msgstr "Pur si simplu includeti cuvantul cheie 'split' adica 'imparte' intr-o linie noua de unul singur (aceasta parte e importanta) ca mai departe: ⏎ ⏎ windows⏎ split" #: lib/gettor/i18n.py:102 msgid "" @@ -164,7 +164,7 @@ msgid "" "2.) Unzip all files ending in \".z\". If you saved all attachments to\n" "a fresh folder before, simply unzip all files in that folder. If you don't\n" "know how to unzip the .z files, please see the UNPACKING THE FILES section." -msgstr "" +msgstr "2.) Dezarchivati toate fisierele terminate in \" .z\". Daca ati salvat inainte toate atasamentele intr-un director sau folder nou, va rugam sa va uitati peste sectiunea DESPACHETAND FISIERELE." #: lib/gettor/i18n.py:114 msgid "" @@ -177,7 +177,7 @@ msgid "" "4.) Now unpack the multi-volume archive into one file by double-\n" "clicking the file ending in \"..split.part01.exe\". This should start the \n" "process automatically." -msgstr "" +msgstr "4.) Acum despachetati archiva multivolum intr-un singur fisier dand dublu clic pe fisierul terminat in \"...split.part01.exe\". Ar trebui sa porneasca instantaneu." #: lib/gettor/i18n.py:121 msgid "" @@ -194,13 +194,13 @@ msgstr "6.) Asta e tot. Ati terminat. Multumim pentru folosirea Tor-ului si bucu msgid "" "SUPPORT\n" "=======" -msgstr "" +msgstr "SUPORT⏎ =======" #: lib/gettor/i18n.py:133 msgid "" "Here's your requested software as a zip file. Please unzip the\n" "package and verify the signature." -msgstr "" +msgstr "Aici este programul cerut ca fisier zip. Dezarhivati pachetul si verificati semnatura." #: lib/gettor/i18n.py:136 msgid "" @@ -210,14 +210,14 @@ msgid "" "tool as follows after unpacking the zip file:\n" "\n" " gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" -msgstr "" +msgstr "VERIFICATI SEMNATURA⏎ ================⏎ Daca aveti instalat pe calculator GnuPG, scrieti in linia de comanda gpg ⏎ asa cum urmeaza dupa ce despachetati fisierul zip:⏎ ⏎ gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" #: lib/gettor/i18n.py:143 msgid "" "The output should look somewhat like this:\n" "\n" " gpg: Good signature from 'Erinn Clark <...>'" -msgstr "" +msgstr "Rezultatul ar trebuie sa arate cam asa:⏎ ⏎ gpg: Semnatura buna de la 'Erinn Clark <...>'" #: lib/gettor/i18n.py:147 msgid "" @@ -225,13 +225,13 @@ msgid "" "a graphical user interface for GnuPG on this website:\n" "\n" " http://www.gnupg.org/related_software/frontends.html" -msgstr "" +msgstr "Daca nu stiti sa folositi linia de comanda, incercati sa cautati o interfata grafica pentru GnuPG la adresa:⏎ ⏎ http://www.gnupg.org/related_software/frontends.html" #: lib/gettor/i18n.py:152 msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" -msgstr "" +msgstr "ACCES INTERZIS / CENZURA⏎ ===========================" #: lib/gettor/i18n.py:155 msgid "" @@ -249,7 +249,7 @@ msgid "" "in the body of the email to the following email address:\n" "\n" " bridges(a)torproject.org" -msgstr "" +msgstr "Puteti sa achizitionati o punte prin trimiterea unei scrisori electronice care sa contina \"get bridges\" in interiorul acesteia la urmatoarea adresa:⏎ ⏎ bridges(a)torproject.org" #: lib/gettor/i18n.py:167 msgid "" @@ -283,7 +283,7 @@ msgstr "" msgid "" "If it doesn't arrive, the package might be too big for your mail provider.\n" "Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." -msgstr "" +msgstr "Daca nu ajunge, pachetul s-ar putea sa fie prea mare pentru furnizorul casutei postale a d-voastra,⏎ Incercati sa retrimiteti scrisoarea de la un cont GMAIL.COM, YAHOO.CN or YAHOO.COM." #: lib/gettor/i18n.py:185 msgid "" @@ -303,7 +303,7 @@ msgstr "Din pacate nu exista nici un pachet impartit potrivit pentru pachetul ce msgid "" "UNPACKING THE FILES\n" "===================" -msgstr "" +msgstr "Despachetand fisierele⏎ ===================" #: lib/gettor/i18n.py:196 msgid "" @@ -312,13 +312,13 @@ msgid "" "your computer yet, you can download it here:\n" "\n" " http://www.7-zip.org/" -msgstr "" +msgstr "Calea cea mai usoara de despachetare a fisierelor primite este sa instalati 7-zip,⏎ un program gratuit de arhivare/dezarhivare. Daca nu este inca instalat⏎ pe calculatorul d-voastra, If it isn't installed on, puteti sa-l descarcati de aici:⏎ ⏎ http://www.7-zip.org/" #: lib/gettor/i18n.py:202 msgid "" "When 7-Zip is installed, you can open the .z archive you received from\n" "us by double-clicking on it." -msgstr "" +msgstr "Dupa instalarea 7-zip-ului, puteti deschide archiva cu extensia .z primita de la noi dand dublu clic pe ea." #: lib/gettor/i18n.py:205 msgid "" @@ -326,13 +326,13 @@ msgid "" ".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" "\"windows.zip\". You should then be able to extract the archive with common \n" "file archiver programs that probably are already installed on your computer." -msgstr "" +msgstr "O alta cale de extragere a fisierelor .z este redenumirea lor in ⏎ .zip. De exemplu, daca ati primit un fisier numit \"windows.z\", redenumiti-l in ⏎ \"windows.zip\". Ar trebui apoi sa puteti extrage arhiva cu programul d-voastra obisnuit ⏎ de arhivare care s-ar putea sa fie deja instalat in calculator." #: lib/gettor/i18n.py:210 msgid "" "Please reply to this mail, and tell me a single package name anywhere\n" "in your reply. Here's a short explanation of what these packages are:" -msgstr "" +msgstr "Va rugam sa raspundeti acestei scrisori si sa ne scrieti un singur nume de pachet oriunde ⏎ in raspuns. Urmeaza o scurta explicatie a ceea ce sunt aceste pachete:" #: lib/gettor/i18n.py:213 msgid "" @@ -340,7 +340,7 @@ msgid "" "The Tor Browser Bundle package for Windows operating systems. If you're \n" "running some version of Windows, like Windows XP, Windows Vista or \n" "Windows 7, this is the package you should get." -msgstr "" +msgstr "windows:⏎ Pachetul Browser Tor pentru sistemele de operare Windows. Daca folositi ⏎ versiuni de Windows ca Windows XP, Windows Vista sau ⏎ Windows 7, acesta e pachetul pe care ar trebui sa-l primiti." #: lib/gettor/i18n.py:218 msgid "" @@ -354,19 +354,19 @@ msgid "" "macos-ppc:\n" "This is an older installer (the \"Vidalia bundle\") for older Macs running\n" "OS X on PowerPC CPUs. Note that this package will be deprecated soon." -msgstr "" +msgstr "macos-ppc:⏎ This is an older installer (the \"Vidalia bundle\") for older Macs running⏎ OS X on PowerPC CPUs. Note that this package will be deprecated soon." #: lib/gettor/i18n.py:226 msgid "" "linux-i386:\n" "The Tor Browser Bundle package for Linux, 32bit versions." -msgstr "" +msgstr "linux-i386:⏎ Pachetul Tor Browser pentru versiunile Linux pe 32biti." #: lib/gettor/i18n.py:229 msgid "" "Note that this package is rather large and needs your email provider to \n" "allow for attachments of about 30MB in size." -msgstr "" +msgstr "Atentie! Acest pachet este cam mare si e nevoie ca furnizorul casutei postale sa permita atasamente de aprox. 30MB." #: lib/gettor/i18n.py:232 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 08 Sep '12

08 Sep '12

commit 245b7d2c182774e0109fe0f8243d7cdea194f926 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 8 12:15:04 2012 +0000 Update translations for gettor --- ro/gettor.po | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ro/gettor.po b/ro/gettor.po index b5feb2a..df6b1d5 100644 --- a/ro/gettor.po +++ b/ro/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-09-08 11:42+0000\n" +"PO-Revision-Date: 2012-09-08 12:14+0000\n" "Last-Translator: chen <moauuka(a)yahoo.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -21,32 +21,32 @@ msgstr "" #: lib/gettor/i18n.py:27 msgid "Hello, This is the \"GetTor\" robot." -msgstr "" +msgstr "Buna, aici e robotul \"GetTor\"." #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "Va multumim pentru cererea d-voastra." #: lib/gettor/i18n.py:31 msgid "" "Unfortunately, we won't answer you at this address. You should make\n" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." -msgstr "" +msgstr "Din pacate nu vom raspunde la aceasta adresa. Ar trebui sa va faceti un cont la GMAIL.COM, YAHOO.COM sau YAHOO.CN si sa ne trimiteti scrisoare de la contul facut la acestia de mai sus." #: lib/gettor/i18n.py:35 msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "Procesam cereri numai de la serviciile de posta electronica ce suporta \"DKIM\", ⏎ care este o caracteristica de posta electronica ce ne lasa sa verificam daca adresa din fata liniei ⏎ \"From\" (adica \"De la\") este chiar aceea a persoanei ce a trimis scrisoarea electronica." +msgstr "Procesam cereri numai de la serviciile de posta electronica ce suporta \"DKIM\", care este o caracteristica de posta electronica ce ne lasa sa verificam daca adresa din fata liniei \"From\" adica \"De la\" este chiar aceea a persoanei ce a trimis scrisoarea electronica." #: lib/gettor/i18n.py:39 msgid "" "(We apologize if you didn't ask for this mail. Since your email is from\n" "a service that doesn't use DKIM, we're sending a short explanation,\n" "and then we'll ignore this email address for the next day or so.)" -msgstr "(Ne pare rau daca nu ati cerut aceasta scrisoare. Deoarece scrisoarea d-voastra este de la ⏎ un serviciu care nu foloseste DKIM, va trimitem o scurta explicatie,⏎ urmand ca apoi sa ignoram aceasta adresa de posta electronica in viitor." +msgstr "(Ne pare rau daca nu ati cerut aceasta scrisoare. Deoarece scrisoarea d-voastra este de la un serviciu care nu foloseste DKIM, va trimitem o scurta explicatie, urmand ca apoi sa ignoram aceasta adresa de posta electronica in viitor.)" #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 msgid "" @@ -71,13 +71,13 @@ msgstr "" msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." -msgstr "" +msgstr "Va rugam sa raspundeti acestei scrisori si sa ne spuneti un singur nume de pachet de oriunde din cuprinsul scrisorii d-voastre." #: lib/gettor/i18n.py:59 msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" -msgstr "" +msgstr "OBTINEREA VERSIUNILOR LOCALE ALE TOR⏎ ===================================" #: lib/gettor/i18n.py:62 msgid "" @@ -85,18 +85,18 @@ msgid "" "language you want in the address you send the mail to:\n" "\n" " gettor+fa(a)torproject.org" -msgstr "" +msgstr "Pentru a primi o versiune d eTor tradusa in limba d-voastra, specificati limba pe care o doriti la adresa unde trimiteti scrisoarea la:⏎ ⏎ gettor+fa(a)torproject.org" #: lib/gettor/i18n.py:67 msgid "" "This example will give you the requested package in a localized\n" "version for Farsi (Persian). Check below for a list of supported language\n" "codes. " -msgstr "" +msgstr "Acest exemplu va va da pachetul cerut in versiunea locala de persana. Verificati mai jos pentru lista codurilor limbilor suportate." #: lib/gettor/i18n.py:71 msgid " List of supported locales:" -msgstr "Lista " +msgstr "Lista limbilor locale suportate:" #: lib/gettor/i18n.py:73 msgid "Here is a list of all available languages:" @@ -115,7 +115,7 @@ msgid "" " gettor+pl(a)torproject.org: Polish\n" " gettor+ru(a)torproject.org: Russian\n" " gettor+zh(a)torproject.org: Chinese" -msgstr "" +msgstr "gettor+ar(a)torproject.org: Araba⏎ gettor+de(a)torproject.org: Germana⏎ gettor+en(a)torproject.org: Engleza⏎ gettor+es(a)torproject.org: Spaniola⏎ gettor+fa(a)torproject.org: Persana (Iran)⏎ gettor+fr(a)torproject.org: Franceza⏎ gettor+it(a)torproject.org: Italiana⏎ gettor+nl(a)torproject.org: Olandeza⏎ gettor+pl(a)torproject.org: Poloneza⏎ gettor+ru(a)torproject.org: Rusa⏎ gettor+zh(a)torproject.org: Chineza" #: lib/gettor/i18n.py:87 msgid "If you select no language, you will receive the English version." @@ -125,14 +125,14 @@ msgstr "Daca nu selectati nici o limba, veti primi versiunea engleza." msgid "" "SMALLER SIZED PACKAGES\n" "======================" -msgstr "" +msgstr "PACHETE MAI MICI⏎ ======================" #: lib/gettor/i18n.py:92 msgid "" "If your bandwith is low or your provider doesn't allow you to\n" "receive large attachments in your email, GetTor can send you several\n" "small packages instead of one big one." -msgstr "" +msgstr "Daca banda d-voastra de internet e redusa sau daca furnizorul de internet nu va permite sa primiti atasamente mari in casuta postala, GetTor va poate trimite cateva pachete mici in locul unuia mare." #: lib/gettor/i18n.py:96 msgid "" @@ -157,7 +157,7 @@ msgstr "Dupa ce ati primit toate partile, trebuie sa le grupati iar intr-un sing #: lib/gettor/i18n.py:108 msgid "1.) Save all received attachments into one folder on your disk." -msgstr "1.) Salvati toate atasamentele primite intr-un singur director (folder) pe discul d-voastra." +msgstr "1.) Salvati toate atasamentele primite intr-un singur director sau folder pe discul d-voastra." #: lib/gettor/i18n.py:110 msgid "" @@ -241,7 +241,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "" +msgstr "Daca conexiunea d-voastra de internet blocheaza accesul la reteaua Tor, s-ar putea sa aveti nevoie de un releu punte \"bridge relay\". Releele punte (ori \"punti\") sunt relee care nu sunt listate in directorul principal. Deoarece nu exista lista publica completa a acestora, chiar daca furnizorul d-voastra de internet ISP filtreaza conexiunile cu toate releele Tor cunoscute, ei nu vor putea probabil sa blocheze toate puntile." #: lib/gettor/i18n.py:162 msgid "" @@ -255,7 +255,7 @@ msgstr "" msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "" +msgstr "Este de asemenea posibil sa aduceti puntile cu un browser de internet de la adresa https://bridges.torproject.org/" #: lib/gettor/i18n.py:170 msgid "" @@ -264,13 +264,13 @@ msgid "" "all split files to be received by you before you can save them all\n" "into the same directory and unpack them by double-clicking the\n" "first file." -msgstr "" +msgstr "IMPORTANT: Deoarece aceasta este o parte a unei cereri de fisier impartit, trebuie sa asteptati primirea tuturor fisierelor impartite pentru ca apoi sa le salvati pe toate in acelasi director sau folder si sa le despachetati cu un dublu clic pe primul fisier." #: lib/gettor/i18n.py:176 msgid "" "Packages might arrive out of order! Please make sure you received\n" "all packages before you attempt to unpack them!" -msgstr "" +msgstr "Pachetele s-ar putea sa nu vina in ordine! Va rugam sa fiti sigur ca ati primit toate pachetele inainte de a incerca sa le despachetati!" #: lib/gettor/i18n.py:179 #, python-format @@ -289,7 +289,7 @@ msgstr "" msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." -msgstr "" +msgstr "Din pacate avem probleme in prezent si nu putem indeplini cererea d-voastra chiar acum. Va rugam sa aveti rabdare in timp ce incercam sa rezolvam problema." #: lib/gettor/i18n.py:188 msgid "" @@ -297,7 +297,7 @@ msgid "" "requested. Please send us another package name or request the same package \n" "again, but remove the 'split' keyword. In that case we'll send you the whole \n" "package. Make sure this is what you want." -msgstr "" +msgstr "Din pacate nu exista nici un pachet impartit potrivit pentru pachetul cerut de d-voastra. Va rugam sa ne trimiteti un alt nume de pachet sau sa ne cereti iar acelasi pachet, dar sa inlaturati cuvantul cheie 'split'. In acest caz va vom trimite intregul pachet. Fiti sigur ca asta este ceea ce vreti." #: lib/gettor/i18n.py:193 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 08 Sep '12

08 Sep '12

commit 2660c0cd0d6d64def0122170aebd5e428e0d7fad Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 8 11:45:04 2012 +0000 Update translations for gettor --- ro/gettor.po | 455 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 455 insertions(+), 0 deletions(-) diff --git a/ro/gettor.po b/ro/gettor.po new file mode 100644 index 0000000..b5feb2a --- /dev/null +++ b/ro/gettor.po @@ -0,0 +1,455 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# <moauuka(a)yahoo.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-13 22:01+0100\n" +"PO-Revision-Date: 2012-09-08 11:42+0000\n" +"Last-Translator: chen <moauuka(a)yahoo.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#: lib/gettor/i18n.py:27 +msgid "Hello, This is the \"GetTor\" robot." +msgstr "" + +#: lib/gettor/i18n.py:29 +msgid "Thank you for your request." +msgstr "" + +#: lib/gettor/i18n.py:31 +msgid "" +"Unfortunately, we won't answer you at this address. You should make\n" +"an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" +"one of those." +msgstr "" + +#: lib/gettor/i18n.py:35 +msgid "" +"We only process requests from email services that support \"DKIM\",\n" +"which is an email feature that lets us verify that the address in the\n" +"\"From\" line is actually the one who sent the mail." +msgstr "Procesam cereri numai de la serviciile de posta electronica ce suporta \"DKIM\", ⏎ care este o caracteristica de posta electronica ce ne lasa sa verificam daca adresa din fata liniei ⏎ \"From\" (adica \"De la\") este chiar aceea a persoanei ce a trimis scrisoarea electronica." + +#: lib/gettor/i18n.py:39 +msgid "" +"(We apologize if you didn't ask for this mail. Since your email is from\n" +"a service that doesn't use DKIM, we're sending a short explanation,\n" +"and then we'll ignore this email address for the next day or so.)" +msgstr "(Ne pare rau daca nu ati cerut aceasta scrisoare. Deoarece scrisoarea d-voastra este de la ⏎ un serviciu care nu foloseste DKIM, va trimitem o scurta explicatie,⏎ urmand ca apoi sa ignoram aceasta adresa de posta electronica in viitor." + +#: lib/gettor/i18n.py:43 lib/gettor/i18n.py:130 +msgid "" +"If you have any questions or it doesn't work, you can contact a\n" +"human at this support email address: help(a)rt.torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:46 +msgid "" +"I will mail you a Tor package, if you tell me which one you want.\n" +"Please select one of the following package names:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" +msgstr "" + +#: lib/gettor/i18n.py:56 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere \n" +"in the body of your email." +msgstr "" + +#: lib/gettor/i18n.py:59 +msgid "" +"OBTAINING LOCALIZED VERSIONS OF TOR\n" +"===================================" +msgstr "" + +#: lib/gettor/i18n.py:62 +msgid "" +"To get a version of Tor translated into your language, specify the\n" +"language you want in the address you send the mail to:\n" +"\n" +" gettor+fa(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:67 +msgid "" +"This example will give you the requested package in a localized\n" +"version for Farsi (Persian). Check below for a list of supported language\n" +"codes. " +msgstr "" + +#: lib/gettor/i18n.py:71 +msgid " List of supported locales:" +msgstr "Lista " + +#: lib/gettor/i18n.py:73 +msgid "Here is a list of all available languages:" +msgstr "Aici este o lista cu toate limbile disponibile:" + +#: lib/gettor/i18n.py:75 +msgid "" +" gettor+ar(a)torproject.org: Arabic\n" +" gettor+de(a)torproject.org: German\n" +" gettor+en(a)torproject.org: English\n" +" gettor+es(a)torproject.org: Spanish\n" +" gettor+fa(a)torproject.org: Farsi (Iran)\n" +" gettor+fr(a)torproject.org: French\n" +" gettor+it(a)torproject.org: Italian\n" +" gettor+nl(a)torproject.org: Dutch\n" +" gettor+pl(a)torproject.org: Polish\n" +" gettor+ru(a)torproject.org: Russian\n" +" gettor+zh(a)torproject.org: Chinese" +msgstr "" + +#: lib/gettor/i18n.py:87 +msgid "If you select no language, you will receive the English version." +msgstr "Daca nu selectati nici o limba, veti primi versiunea engleza." + +#: lib/gettor/i18n.py:89 +msgid "" +"SMALLER SIZED PACKAGES\n" +"======================" +msgstr "" + +#: lib/gettor/i18n.py:92 +msgid "" +"If your bandwith is low or your provider doesn't allow you to\n" +"receive large attachments in your email, GetTor can send you several\n" +"small packages instead of one big one." +msgstr "" + +#: lib/gettor/i18n.py:96 +msgid "" +"Simply include the keyword 'split' in a new line on its own (this part\n" +"is important!) like so: \n" +" \n" +" windows\n" +" split" +msgstr "" + +#: lib/gettor/i18n.py:102 +msgid "" +"Sending this text in an email to GetTor will cause it to send you \n" +"the Tor Browser Bundle in a number of 1,4MB attachments." +msgstr "" + +#: lib/gettor/i18n.py:105 +msgid "" +"After having received all parts, you need to re-assemble them to \n" +"one package again. This is done as follows:" +msgstr "Dupa ce ati primit toate partile, trebuie sa le grupati iar intr-un singur pachet. Se face dupa cum urmeaza:." + +#: lib/gettor/i18n.py:108 +msgid "1.) Save all received attachments into one folder on your disk." +msgstr "1.) Salvati toate atasamentele primite intr-un singur director (folder) pe discul d-voastra." + +#: lib/gettor/i18n.py:110 +msgid "" +"2.) Unzip all files ending in \".z\". If you saved all attachments to\n" +"a fresh folder before, simply unzip all files in that folder. If you don't\n" +"know how to unzip the .z files, please see the UNPACKING THE FILES section." +msgstr "" + +#: lib/gettor/i18n.py:114 +msgid "" +"3.) Verify all files as described in the mail you received with \n" +"each package. (gpg --verify)" +msgstr "3.) Verificati toate fisierele dupa cum a fost explicat in scrisoarea primita cu fiecare pachet. (gpg --verifica)" + +#: lib/gettor/i18n.py:117 +msgid "" +"4.) Now unpack the multi-volume archive into one file by double-\n" +"clicking the file ending in \"..split.part01.exe\". This should start the \n" +"process automatically." +msgstr "" + +#: lib/gettor/i18n.py:121 +msgid "" +"5.) After unpacking is finished, you should find a newly created \n" +"\".exe\" file in your destination folder. Simply doubleclick\n" +"that and Tor Browser Bundle should start within a few seconds." +msgstr "5.) Dupa sfarsitul despachetarii veti gasi un fisier nou creat cu extensia \".exe\" in directorul destinatiei. Dati dublu clic pe acesta si Pachetul Tor ar trebui sa porneasca in cateva secunde." + +#: lib/gettor/i18n.py:125 +msgid "6.) That's it. You're done. Thanks for using Tor and have fun!" +msgstr "6.) Asta e tot. Ati terminat. Multumim pentru folosirea Tor-ului si bucurati-va de el!" + +#: lib/gettor/i18n.py:127 +msgid "" +"SUPPORT\n" +"=======" +msgstr "" + +#: lib/gettor/i18n.py:133 +msgid "" +"Here's your requested software as a zip file. Please unzip the\n" +"package and verify the signature." +msgstr "" + +#: lib/gettor/i18n.py:136 +msgid "" +"VERIFY SIGNATURE\n" +"================\n" +"If your computer has GnuPG installed, use the gpg commandline \n" +"tool as follows after unpacking the zip file:\n" +"\n" +" gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" +msgstr "" + +#: lib/gettor/i18n.py:143 +msgid "" +"The output should look somewhat like this:\n" +"\n" +" gpg: Good signature from 'Erinn Clark <...>'" +msgstr "" + +#: lib/gettor/i18n.py:147 +msgid "" +"If you're not familiar with commandline tools, try looking for\n" +"a graphical user interface for GnuPG on this website:\n" +"\n" +" http://www.gnupg.org/related_software/frontends.html" +msgstr "" + +#: lib/gettor/i18n.py:152 +msgid "" +"BLOCKED ACCESS / CENSORSHIP\n" +"===========================" +msgstr "" + +#: lib/gettor/i18n.py:155 +msgid "" +"If your Internet connection blocks access to the Tor network, you\n" +"may need a bridge relay. Bridge relays (or \"bridges\" for short)\n" +"are Tor relays that aren't listed in the main directory. Since there\n" +"is no complete public list of them, even if your ISP is filtering\n" +"connections to all the known Tor relays, they probably won't be able\n" +"to block all the bridges." +msgstr "" + +#: lib/gettor/i18n.py:162 +msgid "" +"You can acquire a bridge by sending an email that contains \"get bridges\"\n" +"in the body of the email to the following email address:\n" +"\n" +" bridges(a)torproject.org" +msgstr "" + +#: lib/gettor/i18n.py:167 +msgid "" +"It is also possible to fetch bridges with a web browser at the following\n" +"url: https://bridges.torproject.org/" +msgstr "" + +#: lib/gettor/i18n.py:170 +msgid "" +"IMPORTANT NOTE:\n" +"Since this is part of a split-file request, you need to wait for\n" +"all split files to be received by you before you can save them all\n" +"into the same directory and unpack them by double-clicking the\n" +"first file." +msgstr "" + +#: lib/gettor/i18n.py:176 +msgid "" +"Packages might arrive out of order! Please make sure you received\n" +"all packages before you attempt to unpack them!" +msgstr "" + +#: lib/gettor/i18n.py:179 +#, python-format +msgid "" +"It was successfully understood. Your request is currently being processed.\n" +"Your package (%s) should arrive within the next ten minutes." +msgstr "" + +#: lib/gettor/i18n.py:182 +msgid "" +"If it doesn't arrive, the package might be too big for your mail provider.\n" +"Try resending the mail from a GMAIL.COM, YAHOO.CN or YAHOO.COM account." +msgstr "" + +#: lib/gettor/i18n.py:185 +msgid "" +"Unfortunately we are currently experiencing problems and we can't fulfill\n" +"your request right now. Please be patient as we try to resolve this issue." +msgstr "" + +#: lib/gettor/i18n.py:188 +msgid "" +"Unfortunately there is no split package available for the package you\n" +"requested. Please send us another package name or request the same package \n" +"again, but remove the 'split' keyword. In that case we'll send you the whole \n" +"package. Make sure this is what you want." +msgstr "" + +#: lib/gettor/i18n.py:193 +msgid "" +"UNPACKING THE FILES\n" +"===================" +msgstr "" + +#: lib/gettor/i18n.py:196 +msgid "" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" +msgstr "" + +#: lib/gettor/i18n.py:202 +msgid "" +"When 7-Zip is installed, you can open the .z archive you received from\n" +"us by double-clicking on it." +msgstr "" + +#: lib/gettor/i18n.py:205 +msgid "" +"An alternative way to get the .z files extraced is to rename them to\n" +".zip. For example, if you recevied a file called \"windows.z\", rename it to \n" +"\"windows.zip\". You should then be able to extract the archive with common \n" +"file archiver programs that probably are already installed on your computer." +msgstr "" + +#: lib/gettor/i18n.py:210 +msgid "" +"Please reply to this mail, and tell me a single package name anywhere\n" +"in your reply. Here's a short explanation of what these packages are:" +msgstr "" + +#: lib/gettor/i18n.py:213 +msgid "" +"windows:\n" +"The Tor Browser Bundle package for Windows operating systems. If you're \n" +"running some version of Windows, like Windows XP, Windows Vista or \n" +"Windows 7, this is the package you should get." +msgstr "" + +#: lib/gettor/i18n.py:218 +msgid "" +"macos-i386:\n" +"The Tor Browser Bundle package for OS X, Intel CPU architecture. In \n" +"general, newer Mac hardware will require you to use this package." +msgstr "" + +#: lib/gettor/i18n.py:222 +msgid "" +"macos-ppc:\n" +"This is an older installer (the \"Vidalia bundle\") for older Macs running\n" +"OS X on PowerPC CPUs. Note that this package will be deprecated soon." +msgstr "" + +#: lib/gettor/i18n.py:226 +msgid "" +"linux-i386:\n" +"The Tor Browser Bundle package for Linux, 32bit versions." +msgstr "" + +#: lib/gettor/i18n.py:229 +msgid "" +"Note that this package is rather large and needs your email provider to \n" +"allow for attachments of about 30MB in size." +msgstr "" + +#: lib/gettor/i18n.py:232 +msgid "" +"linux-x86_64:\n" +"The Tor Browser Bundle package for Linux, 64bit versions." +msgstr "" + +#: lib/gettor/i18n.py:235 +msgid "" +"source:\n" +"The Tor source code, for experts. Most users do not want this package." +msgstr "" + +#: lib/gettor/i18n.py:238 +msgid "" +"FREQUENTLY ASKED QUESTIONS\n" +"==========================" +msgstr "" + +#: lib/gettor/i18n.py:241 +msgid "What is Tor?" +msgstr "" + +#: lib/gettor/i18n.py:243 +msgid "The name \"Tor\" can refer to several different components." +msgstr "" + +#: lib/gettor/i18n.py:245 +msgid "" +"The Tor software is a program you can run on your computer that helps \n" +"keep you safe on the Internet. Tor protects you by bouncing your \n" +"communications around a distributed network of relays run by volunteers \n" +"all around the world: it prevents somebody watching your Internet connection \n" +"from learning what sites you visit, and it prevents the sites you visit from \n" +"learning your physical location. This set of volunteer relays is called the \n" +"Tor network. You can read more about how Tor works here:\n" +"\n" +" https://www.torproject.org/about/overview.html.en" +msgstr "" + +#: lib/gettor/i18n.py:255 +msgid "What is the Tor Browser Bundle?" +msgstr "" + +#: lib/gettor/i18n.py:257 +msgid "" +"The Browser Bundle (TBB) is the package we recommend to most users. \n" +"The bundle comes with everything you need to safely browse the Internet.\n" +"Just extract it and run." +msgstr "" + +#: lib/gettor/i18n.py:261 +msgid "What package should I request?" +msgstr "" + +#: lib/gettor/i18n.py:263 +msgid "" +"This depends on the operating system you use. For instance, if your\n" +"operating system is Microsoft Windows, you should request \"windows\". Here\n" +"is a short explanation of all packages to request and what operating \n" +"systems there are suitable for:" +msgstr "" + +#: lib/gettor/i18n.py:268 +msgid "How do I extract the file(s) you sent me?" +msgstr "" + +#: lib/gettor/i18n.py:270 +msgid "QUESTION:" +msgstr "" + +#: lib/gettor/i18n.py:272 +msgid "ANSWER:" +msgstr "" + +#: lib/gettor/i18n.py:274 +#, python-format +msgid "" +"Sorry, but the package you requested (%s) is too large for your \n" +"provider to accept as an attachment. Try using another provider that allows \n" +"for larger email attachments. Or try one of the following mirrors:\n" +"\n" +" https://www.oignon.net/dist/torbrowser/\n" +" https://tor.beme-it.de/dist/torbrowser/\n" +" https://www.torservers.net/mirrors/torproject.org/dist/torbrowser/" +msgstr ""

1 0

[flashproxy/master] Add JavaScript build_url function.
by dcf＠torproject.org 08 Sep '12

08 Sep '12

commit 143d3d99518f6e4ab970f8842e71e2133e68e44c Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 7 12:23:10 2012 -0700 Add JavaScript build_url function. --- flashproxy-test.js | 47 ++++++++++++++++++++++++++++++++++++++++++++++ flashproxy.js | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index 1961740..3db15e0 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -60,6 +60,52 @@ function fail(test, expected, actual) print("FAIL " + repr(test) + " expected: " + repr(expected) + " actual: " + repr(actual)); } +function test_build_url() +{ + var TESTS = [ + { args: ["http", "example.com"], + expected: "http://example.com" }, + { args: ["http", "example.com", 80], + expected: "http://example.com" }, + { args: ["http", "example.com", 81], + expected: "http://example.com:81" }, + { args: ["https", "example.com", 443], + expected: "https://example.com" }, + { args: ["https", "example.com", 444], + expected: "https://example.com:444" }, + { args: ["http", "example.com", 80, "/"], + expected: "http://example.com/" }, + { args: ["http", "example.com", 80, "/test?k=%#v"], + expected: "http://example.com/test%3Fk%3D%25%23v" }, + { args: ["http", "example.com", 80, "/test", []], + expected: "http://example.com/test?" }, + { args: ["http", "example.com", 80, "/test", [["k", "%#v"]]], + expected: "http://example.com/test?k=%25%23v" }, + { args: ["http", "example.com", 80, "/test", [["a", "b"], ["c", "d"]]], + expected: "http://example.com/test?a=b&c=d" }, + { args: ["http", "1.2.3.4"], + expected: "http://1.2.3.4" }, + { args: ["http", "1:2::3:4"], + expected: "http://[1:2::3:4]" }, + { args: ["http", "bog][us"], + expected: "http://bog%5D%5Bus" }, + { args: ["http", "bog:u]s"], + expected: "http://bog%3Au%5Ds" }, + ]; + + announce("test_build_url"); + for (var i = 0; i < TESTS.length; i++) { + var test = TESTS[i]; + var actual; + + actual = build_url.apply(undefined, test.args); + if (objects_equal(actual, test.expected)) + pass(test.args); + else + fail(test.args, test.expected, actual); + } +} + function test_parse_query_string() { var TESTS = [ @@ -170,6 +216,7 @@ function test_get_query_param_addr() } } +test_build_url(); test_parse_query_string(); test_parse_addr_spec(); test_get_query_param_addr(); diff --git a/flashproxy.js b/flashproxy.js index 50526a4..d5b1c99 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -128,6 +128,59 @@ function parse_query_string(qs) { return result; } +var DEFAULT_PORTS = { + http: 80, + https: 443 +} +/* Build an escaped URL string from unescaped components. Only scheme and host + are required. See RFC 3986, section 3. */ +function build_url(scheme, host, port, path, params) { + var parts = [] + + parts.push(encodeURIComponent(scheme)); + parts.push("://"); + + /* If it contains a colon but no square brackets, treat it like an IPv6 + address. */ + if (host.match(/:/) && !host.match(/[[\]]/)) { + parts.push("["); + parts.push(host); + parts.push("]"); + } else { + parts.push(encodeURIComponent(host)); + } + if (port !== undefined && port !== DEFAULT_PORTS[scheme]) { + parts.push(":"); + parts.push(encodeURIComponent(port.toString())); + } + + if (path !== undefined && path !== "") { + if (!path.match(/^\//)) + path = "/" + path; + /* Slash is significant so we must protect it from encodeURIComponent, + while still encoding question mark and number sign. RFC 3986, section + 3.3: "The path is terminated by the first question mark ('?') or + number sign ('#') character, or by the end of the URI. ... A path + consists of a sequence of path segments separated by a slash ('/') + character." */ + path = path.replace(/[^\/]+/, function(m) { + return encodeURIComponent(m); + }); + parts.push(path); + } + + if (params !== undefined) { + parts.push("?"); + for (var i = 0; i < params.length; i++) { + if (i > 0) + parts.push("&"); + parts.push(encodeURIComponent(params[i][0]) + "=" + encodeURIComponent(params[i][1])); + } + } + + return parts.join(""); +} + /* Get a query string parameter and parse it as an address spec. Returns default_val if param is not defined in the query string. Returns null on a parsing error. */

1 0

[flashproxy/master] Use empty array, not object, in parse_query_string.
by dcf＠torproject.org 08 Sep '12

08 Sep '12

commit 54055895a0de6ca73260fce8fd196471261f9a90 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 7 12:24:19 2012 -0700 Use empty array, not object, in parse_query_string. --- flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index b0bdf21..50526a4 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -106,7 +106,7 @@ function parse_query_string(qs) { if (qs) strings = qs.split("&"); else - strings = {}; + strings = []; for (var i = 0; i < strings.length; i++) { var string = strings[i]; var j, name, value;

1 0

[flashproxy/master] Use build_url.
by dcf＠torproject.org 08 Sep '12

08 Sep '12

commit 42fffebdcb1c33c9e5824fdff278f9966ebb05ce Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 7 12:50:22 2012 -0700 Use build_url. --- flashproxy.js | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index d5b1c99..7e5a28d 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -322,8 +322,7 @@ function make_websocket(addr) { var url; var ws; - url = "ws://" + encodeURIComponent(addr.host) - + ":" + encodeURIComponent(addr.port) + "/"; + url = build_url("ws", addr.host, addr.port, "/"); if (have_websocket_binary_frames()) ws = new WebSocket(url); @@ -425,8 +424,7 @@ function FlashProxy() { return; } - fac_url = "https://" + encodeURIComponent(this.fac_addr.host) - + ":" + encodeURIComponent(this.fac_addr.port) + "/"; + fac_url = build_url("https", this.fac_addr.host, this.fac_addr.port, "/"); xhr = new XMLHttpRequest(); try { xhr.open("GET", fac_url);

1 0

[torbrowser/master] Update patches for FF15.0.1.
by mikeperry＠torproject.org 08 Sep '12

08 Sep '12

commit 2077234f9c6b74b41a4d7d2c6a36455a039cd651 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 7 17:50:11 2012 -0700 Update patches for FF15.0.1. --- ...nents.interfaces-lookupMethod-from-conten.patch | 4 +- ...0002-Make-Permissions-Manager-memory-only.patch | 4 +- ...-Make-Intermediate-Cert-Store-memory-only.patch | 4 +- .../alpha/0004-Add-a-string-based-cacheKey.patch | 14 ++++---- .../0005-Block-all-plugins-except-flash.patch | 4 +- ...ontent-pref-service-memory-only-clearable.patch | 4 +- .../0007-Disable-SSL-Session-ID-tracking.patch | 4 +- ...ice-and-system-specific-CSS-Media-Queries.patch | 4 +- .../0009-Make-Download-manager-memory-only.patch | 4 +- .../0010-Add-DDG-and-StartPage-to-Omnibox.patch | 4 +- ...-nsICacheService.EvictEntries-synchronous.patch | 10 +++--- ...owser-exit-when-not-launched-from-Vidalia.patch | 4 +- ...13-Limit-the-number-of-fonts-per-document.patch | 4 +- ...observer-event-to-close-persistent-connec.patch | 14 ++++---- .../alpha/0015-Rebrand-Firefox-to-TorBrowser.patch | 4 +- .../alpha/0016-Prevent-WebSocket-DNS-leak.patch | 4 +- ...ize-HTTP-request-order-and-pipeline-depth.patch | 10 +++--- ...Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch | 4 +- ...9-Add-a-redirect-API-for-HTTPS-Everywhere.patch | 36 ++++++++++---------- 19 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/current-patches/firefox/alpha/0001-Block-Components.interfaces-lookupMethod-from-conten.patch b/src/current-patches/firefox/alpha/0001-Block-Components.interfaces-lookupMethod-from-conten.patch index 41da39d..921a716 100644 --- a/src/current-patches/firefox/alpha/0001-Block-Components.interfaces-lookupMethod-from-conten.patch +++ b/src/current-patches/firefox/alpha/0001-Block-Components.interfaces-lookupMethod-from-conten.patch @@ -1,7 +1,7 @@ -From d4c3ef2aadb70643bf0a3784cd5d9e9bb72481e1 Mon Sep 17 00:00:00 2001 +From caab8c136e806dcd913d637210ff187abb1b6b29 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:40:40 -0800 -Subject: [PATCH 01/20] Block Components.interfaces,lookupMethod from content +Subject: [PATCH 01/19] Block Components.interfaces,lookupMethod from content This patch removes the ability of content script to access Components.interfaces.* as well as call or access Components.lookupMethod. diff --git a/src/current-patches/firefox/alpha/0002-Make-Permissions-Manager-memory-only.patch b/src/current-patches/firefox/alpha/0002-Make-Permissions-Manager-memory-only.patch index 3dfb09b..d73f1ab 100644 --- a/src/current-patches/firefox/alpha/0002-Make-Permissions-Manager-memory-only.patch +++ b/src/current-patches/firefox/alpha/0002-Make-Permissions-Manager-memory-only.patch @@ -1,7 +1,7 @@ -From 59d440e340d37c95fe71396f420db13908df80d2 Mon Sep 17 00:00:00 2001 +From 12acd440d185f5536eed99084c4800a46d617197 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:45:16 -0800 -Subject: [PATCH 02/20] Make Permissions Manager memory-only +Subject: [PATCH 02/19] Make Permissions Manager memory-only This patch exposes a pref 'permissions.memory_only' that properly isolates the permissions manager to memory, which is responsible for all user specified diff --git a/src/current-patches/firefox/alpha/0003-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/firefox/alpha/0003-Make-Intermediate-Cert-Store-memory-only.patch index 6873aee..33cf5e9 100644 --- a/src/current-patches/firefox/alpha/0003-Make-Intermediate-Cert-Store-memory-only.patch +++ b/src/current-patches/firefox/alpha/0003-Make-Intermediate-Cert-Store-memory-only.patch @@ -1,7 +1,7 @@ -From 128b9ac61b08961bd606290c5a24231d4bf5622c Mon Sep 17 00:00:00 2001 +From a95872e8de8230e8e0128314acd335a7cb3510fb Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 19 Aug 2011 17:58:23 -0700 -Subject: [PATCH 03/20] Make Intermediate Cert Store memory-only. +Subject: [PATCH 03/19] Make Intermediate Cert Store memory-only. This patch makes the intermediate SSL cert store exist in memory only. diff --git a/src/current-patches/firefox/alpha/0004-Add-a-string-based-cacheKey.patch b/src/current-patches/firefox/alpha/0004-Add-a-string-based-cacheKey.patch index 3f01281..bbc6220 100644 --- a/src/current-patches/firefox/alpha/0004-Add-a-string-based-cacheKey.patch +++ b/src/current-patches/firefox/alpha/0004-Add-a-string-based-cacheKey.patch @@ -1,7 +1,7 @@ -From edf66166ab881d3cafc73ffcc8d2ec4b78ef42ed Mon Sep 17 00:00:00 2001 +From df164279499b23794a112de4305f3ed99a25da68 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 17:03:57 -0700 -Subject: [PATCH 04/20] Add a string-based cacheKey. +Subject: [PATCH 04/19] Add a string-based cacheKey. Used for isolating cache according to same-origin policy. --- @@ -29,10 +29,10 @@ index 96a8aef..b1c6f05 100644 * may fail if the disk cache is not present. The value of this attribute * is usually only settable during the processing of a channel's diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 0c8b530..529857b 100644 +index 290d04c..9c10e3a 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -2543,6 +2543,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, +@@ -2538,6 +2538,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, cacheKey.Append(buf); } @@ -45,7 +45,7 @@ index 0c8b530..529857b 100644 if (!cacheKey.IsEmpty()) { cacheKey.AppendLiteral("uri="); } -@@ -4881,6 +4887,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value) +@@ -4876,6 +4882,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value) } NS_IMETHODIMP @@ -69,10 +69,10 @@ index 0c8b530..529857b 100644 { value = mOfflineCacheClientID; diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h -index 333e884..3d06ffd 100644 +index eaad05e..0382b1c 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h -@@ -302,6 +302,7 @@ private: +@@ -292,6 +292,7 @@ private: nsCOMPtr<nsICacheEntryDescriptor> mOfflineCacheEntry; nsCacheAccessMode mOfflineCacheAccess; nsCString mOfflineCacheClientID; diff --git a/src/current-patches/firefox/alpha/0005-Block-all-plugins-except-flash.patch b/src/current-patches/firefox/alpha/0005-Block-all-plugins-except-flash.patch index bc7afbb..79d92de 100644 --- a/src/current-patches/firefox/alpha/0005-Block-all-plugins-except-flash.patch +++ b/src/current-patches/firefox/alpha/0005-Block-all-plugins-except-flash.patch @@ -1,7 +1,7 @@ -From 20068bdda01cb2a1cd0f890fe2172887318ec20c Mon Sep 17 00:00:00 2001 +From 5c43ec0bcc08d82d7ea1895e2586028ff0c43db2 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:50:15 -0800 -Subject: [PATCH 05/20] Block all plugins except flash. +Subject: [PATCH 05/19] Block all plugins except flash. We cannot use the @mozilla.org/extensions/blocklist;1 service, because we actually want to stop plugins from ever entering the browser's process space diff --git a/src/current-patches/firefox/alpha/0006-Make-content-pref-service-memory-only-clearable.patch b/src/current-patches/firefox/alpha/0006-Make-content-pref-service-memory-only-clearable.patch index f2bd23d..cc75ee1 100644 --- a/src/current-patches/firefox/alpha/0006-Make-content-pref-service-memory-only-clearable.patch +++ b/src/current-patches/firefox/alpha/0006-Make-content-pref-service-memory-only-clearable.patch @@ -1,7 +1,7 @@ -From b967a0bf9803f887876635cb0c40c66e900dec35 Mon Sep 17 00:00:00 2001 +From c1f6abc0766763e65c5e8b22f72171c5f8e4639b Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu, 8 Sep 2011 08:40:17 -0700 -Subject: [PATCH 06/20] Make content pref service memory-only + clearable +Subject: [PATCH 06/19] Make content pref service memory-only + clearable This prevents random urls from being inserted into content-prefs.sqllite in the profile directory as content prefs change (includes site-zoom and perhaps diff --git a/src/current-patches/firefox/alpha/0007-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/alpha/0007-Disable-SSL-Session-ID-tracking.patch index befce4a..5b8270a 100644 --- a/src/current-patches/firefox/alpha/0007-Disable-SSL-Session-ID-tracking.patch +++ b/src/current-patches/firefox/alpha/0007-Disable-SSL-Session-ID-tracking.patch @@ -1,7 +1,7 @@ -From a143df8693d811bde257a748ffc914aca38acb21 Mon Sep 17 00:00:00 2001 +From e3703799acddc621be9c64299070180721b489dc Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed, 7 Dec 2011 19:36:38 -0800 -Subject: [PATCH 07/20] Disable SSL Session ID tracking. +Subject: [PATCH 07/19] Disable SSL Session ID tracking. We can't easily bind SSL Session ID tracking to url bar domain, so we have to disable them to satisfy diff --git a/src/current-patches/firefox/alpha/0008-Limit-device-and-system-specific-CSS-Media-Queries.patch b/src/current-patches/firefox/alpha/0008-Limit-device-and-system-specific-CSS-Media-Queries.patch index 7276a46..1b7d396 100644 --- a/src/current-patches/firefox/alpha/0008-Limit-device-and-system-specific-CSS-Media-Queries.patch +++ b/src/current-patches/firefox/alpha/0008-Limit-device-and-system-specific-CSS-Media-Queries.patch @@ -1,7 +1,7 @@ -From 1bed42f67d1dd1a10693199448e495b155c44034 Mon Sep 17 00:00:00 2001 +From fdecb1911dd0bbd9bc611931c16026de17f6cbe9 Mon Sep 17 00:00:00 2001 From: Shondoit Walker <shondoit(a)gmail.com> Date: Mon, 4 Jun 2012 19:15:31 +0200 -Subject: [PATCH 08/20] Limit device- and system-specific CSS Media Queries +Subject: [PATCH 08/19] Limit device- and system-specific CSS Media Queries This is done to address https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linka… diff --git a/src/current-patches/firefox/alpha/0009-Make-Download-manager-memory-only.patch b/src/current-patches/firefox/alpha/0009-Make-Download-manager-memory-only.patch index dfc54fd..6ee2744 100644 --- a/src/current-patches/firefox/alpha/0009-Make-Download-manager-memory-only.patch +++ b/src/current-patches/firefox/alpha/0009-Make-Download-manager-memory-only.patch @@ -1,7 +1,7 @@ -From 3788af0e0eee6639870de19a48178d9718542dc6 Mon Sep 17 00:00:00 2001 +From ec182e8a83826db0c2bae711d594a26cd0b08a22 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 25 Apr 2012 13:39:35 -0700 -Subject: [PATCH 09/20] Make Download manager memory only. +Subject: [PATCH 09/19] Make Download manager memory only. Solves https://trac.torproject.org/projects/tor/ticket/4017. diff --git a/src/current-patches/firefox/alpha/0010-Add-DDG-and-StartPage-to-Omnibox.patch b/src/current-patches/firefox/alpha/0010-Add-DDG-and-StartPage-to-Omnibox.patch index 50feb06..e9c6c2c 100644 --- a/src/current-patches/firefox/alpha/0010-Add-DDG-and-StartPage-to-Omnibox.patch +++ b/src/current-patches/firefox/alpha/0010-Add-DDG-and-StartPage-to-Omnibox.patch @@ -1,7 +1,7 @@ -From 78271fc762f49a74b762afa62b69d62f55bc5ab9 Mon Sep 17 00:00:00 2001 +From e58200766a98fc8e239c95eb19a0afcf9fcd6381 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 25 Apr 2012 15:03:46 -0700 -Subject: [PATCH 10/20] Add DDG and StartPage to Omnibox. +Subject: [PATCH 10/19] Add DDG and StartPage to Omnibox. You mean there are search engines that don't require captchas if you don't have a cookie? Holy crap. Get those in there now. diff --git a/src/current-patches/firefox/alpha/0011-Make-nsICacheService.EvictEntries-synchronous.patch b/src/current-patches/firefox/alpha/0011-Make-nsICacheService.EvictEntries-synchronous.patch index 9db46a6..879cfa6 100644 --- a/src/current-patches/firefox/alpha/0011-Make-nsICacheService.EvictEntries-synchronous.patch +++ b/src/current-patches/firefox/alpha/0011-Make-nsICacheService.EvictEntries-synchronous.patch @@ -1,7 +1,7 @@ -From fe734b407d4dca7e83cd08b918418b73af15fa8a Mon Sep 17 00:00:00 2001 +From b0f594e6130bf618a25d33d80f7b66d110449dc9 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 1 May 2012 15:02:03 -0700 -Subject: [PATCH 11/20] Make nsICacheService.EvictEntries synchronous +Subject: [PATCH 11/19] Make nsICacheService.EvictEntries synchronous This fixes a race condition that allows cache-based EverCookies to persist for a brief time (on the order of minutes?) after cache clearing/"New Identity". @@ -12,10 +12,10 @@ https://trac.torproject.org/projects/tor/ticket/5715 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp -index 709705e..d3af3fc 100644 +index 991cc34..ef2ad25 100644 --- a/netwerk/cache/nsCacheService.cpp +++ b/netwerk/cache/nsCacheService.cpp -@@ -1460,10 +1460,21 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor) +@@ -1506,10 +1506,21 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor) return NS_OK; } @@ -31,7 +31,7 @@ index 709705e..d3af3fc 100644 + if (storagePolicy == nsICache::STORE_ANYWHERE && + NS_IsMainThread() && gService && gService->mInitialized) { + nsCacheServiceAutoLock lock; -+ gService->DoomActiveEntries(nsnull); ++ gService->DoomActiveEntries(); + gService->ClearDoomList(); + (void) SyncWithCacheIOThread(); + } diff --git a/src/current-patches/firefox/alpha/0012-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch b/src/current-patches/firefox/alpha/0012-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch index a3d06cc..91a5347 100644 --- a/src/current-patches/firefox/alpha/0012-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch +++ b/src/current-patches/firefox/alpha/0012-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch @@ -1,7 +1,7 @@ -From 4d49aed78e8185f590060be473ab7e2013e6a792 Mon Sep 17 00:00:00 2001 +From 07ed1fba9d99b3aa860ab75f34c7650341c59b77 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 7 Jun 2012 14:45:26 -0700 -Subject: [PATCH 12/20] Make Tor Browser exit when not launched from Vidalia +Subject: [PATCH 12/19] Make Tor Browser exit when not launched from Vidalia Turns out the Windows 7 UI encourages users to "dock" their Tor Browser app for easy relaunch. If they manage to do this, we should fail closed rather diff --git a/src/current-patches/firefox/alpha/0013-Limit-the-number-of-fonts-per-document.patch b/src/current-patches/firefox/alpha/0013-Limit-the-number-of-fonts-per-document.patch index cf7aac9..95e3f48 100644 --- a/src/current-patches/firefox/alpha/0013-Limit-the-number-of-fonts-per-document.patch +++ b/src/current-patches/firefox/alpha/0013-Limit-the-number-of-fonts-per-document.patch @@ -1,7 +1,7 @@ -From a7917e7ceb3aebfc20f56fa64ec9780dd32f78e3 Mon Sep 17 00:00:00 2001 +From a94c453f1b68acddb84d1a97e10de3994dfdf2cd Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 7 Jun 2012 15:09:59 -0700 -Subject: [PATCH 13/20] Limit the number of fonts per document. +Subject: [PATCH 13/19] Limit the number of fonts per document. We create two prefs: browser.display.max_font_count and browser.display.max_font_attempts. diff --git a/src/current-patches/firefox/alpha/0014-Provide-an-observer-event-to-close-persistent-connec.patch b/src/current-patches/firefox/alpha/0014-Provide-an-observer-event-to-close-persistent-connec.patch index 9d50822..6f63876 100644 --- a/src/current-patches/firefox/alpha/0014-Provide-an-observer-event-to-close-persistent-connec.patch +++ b/src/current-patches/firefox/alpha/0014-Provide-an-observer-event-to-close-persistent-connec.patch @@ -1,7 +1,7 @@ -From f67aed29f53ef17aad69cba6d008df4f2d09d231 Mon Sep 17 00:00:00 2001 +From af43ed872bd64b623ea1d5b83926c4d06e8fcd7d Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Tue, 28 Aug 2012 18:03:22 -0700 -Subject: [PATCH 14/20] Provide an observer event to close persistent +Date: Fri, 7 Sep 2012 16:18:26 -0700 +Subject: [PATCH 14/19] Provide an observer event to close persistent connections We need to prevent linkability across "New Identity", which includes closing @@ -11,18 +11,18 @@ keep-alive connections. 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp -index 8b5533f..3647edc 100644 +index 2f71837..b066140 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp -@@ -307,6 +307,7 @@ nsHttpHandler::Init() - mObserverService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, true); +@@ -309,6 +309,7 @@ nsHttpHandler::Init() mObserverService->AddObserver(this, "net:clear-active-logins", true); + mObserverService->AddObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC, true); mObserverService->AddObserver(this, "net:prune-dead-connections", true); + mObserverService->AddObserver(this, "net:prune-all-connections", true); mObserverService->AddObserver(this, "net:failed-to-process-uri-content", true); } -@@ -1625,6 +1626,12 @@ nsHttpHandler::Observe(nsISupports *subject, +@@ -1651,6 +1652,12 @@ nsHttpHandler::Observe(nsISupports *subject, if (uri && mConnMgr) mConnMgr->ReportFailedToProcess(uri); } diff --git a/src/current-patches/firefox/alpha/0015-Rebrand-Firefox-to-TorBrowser.patch b/src/current-patches/firefox/alpha/0015-Rebrand-Firefox-to-TorBrowser.patch index 2829fa2..2a6a9c5 100644 --- a/src/current-patches/firefox/alpha/0015-Rebrand-Firefox-to-TorBrowser.patch +++ b/src/current-patches/firefox/alpha/0015-Rebrand-Firefox-to-TorBrowser.patch @@ -1,7 +1,7 @@ -From 883793ca836ce271f65ea6c31d27f41c7240ca59 Mon Sep 17 00:00:00 2001 +From d14732e7069aa8c33733f067e1e706bd852e3aba Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:05:11 -0700 -Subject: [PATCH 15/20] Rebrand Firefox to TorBrowser +Subject: [PATCH 15/19] Rebrand Firefox to TorBrowser This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. diff --git a/src/current-patches/firefox/alpha/0016-Prevent-WebSocket-DNS-leak.patch b/src/current-patches/firefox/alpha/0016-Prevent-WebSocket-DNS-leak.patch index bde4e62..3c0367d 100644 --- a/src/current-patches/firefox/alpha/0016-Prevent-WebSocket-DNS-leak.patch +++ b/src/current-patches/firefox/alpha/0016-Prevent-WebSocket-DNS-leak.patch @@ -1,7 +1,7 @@ -From 2bf15d1165f2d7aad286ab1591db318682ef4df2 Mon Sep 17 00:00:00 2001 +From 727bc1103bc663e1bc2a25bb4fb8e9c9fb31763b Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:07:37 -0700 -Subject: [PATCH 16/20] Prevent WebSocket DNS leak. +Subject: [PATCH 16/19] Prevent WebSocket DNS leak. This is due to an improper implementation of the WebSocket spec by Mozilla. diff --git a/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch index 8550cdd..76330a3 100644 --- a/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -1,7 +1,7 @@ -From fc8110586a4777dfd3cb93eb5544535f6bd7b0f3 Mon Sep 17 00:00:00 2001 +From c5b94226e50a5502ef7902e2d05874f36d678769 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:08:27 -0700 -Subject: [PATCH 17/20] Randomize HTTP request order and pipeline depth. +Subject: [PATCH 17/19] Randomize HTTP request order and pipeline depth. This is an experimental defense against http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf @@ -24,7 +24,7 @@ request order (though SPDY is still disabled by default in TBB). 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 60a6807..334c5fb 100644 +index 0bfaf3b..d565532 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -20,6 +20,8 @@ @@ -93,7 +93,7 @@ index 60a6807..334c5fb 100644 } nsHttpConnectionMgr::~nsHttpConnectionMgr() -@@ -1153,6 +1185,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap +@@ -1141,6 +1173,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap maxPersistConns = mMaxPersistConnsPerHost; } @@ -113,7 +113,7 @@ index 60a6807..334c5fb 100644 // use >= just to be safe bool result = (totalCount >= maxConns) || ( (caps & NS_HTTP_ALLOW_KEEPALIVE) && (persistCount >= maxPersistConns) ); -@@ -1319,6 +1364,11 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, +@@ -1307,6 +1352,11 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, maxdepth = PR_MIN(maxdepth, depthLimit); diff --git a/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch b/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch index 4bdffcc..109574a 100644 --- a/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch +++ b/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch @@ -1,7 +1,7 @@ -From 40ffe7af2a41166a91f95fe145d3cb97527e4165 Mon Sep 17 00:00:00 2001 +From d705e4bb2b7efd4166d46d6fcb3183212902707c Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:22:32 -0700 -Subject: [PATCH 18/20] Adapt Steven Michaud's Mac crashfix patch +Subject: [PATCH 18/19] Adapt Steven Michaud's Mac crashfix patch Source is: https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 diff --git a/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch b/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch index de0b3ad..7f8ac2d 100644 --- a/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch +++ b/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch @@ -1,7 +1,7 @@ -From 704d06cc2310082c12abd7b8ccfbb71dae1c0a9f Mon Sep 17 00:00:00 2001 +From b5d6491427d18bbae057a2974ea80421163fbc0a Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:30:22 -0700 -Subject: [PATCH 19/20] Add a redirect API for HTTPS-Everywhere. +Subject: [PATCH 19/19] Add a redirect API for HTTPS-Everywhere. --- netwerk/protocol/http/HttpChannelChild.cpp | 15 ++++- @@ -16,7 +16,7 @@ Subject: [PATCH 19/20] Add a redirect API for HTTPS-Everywhere. 9 files changed, 117 insertions(+), 12 deletions(-) diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp -index 691fee0..f22fa40 100644 +index cc88184..c26c8f4 100644 --- a/netwerk/protocol/http/HttpChannelChild.cpp +++ b/netwerk/protocol/http/HttpChannelChild.cpp @@ -1035,7 +1035,8 @@ HttpChannelChild::AsyncOpen(nsIStreamListener *listener, nsISupports *aContext) @@ -71,7 +71,7 @@ index 6b699c7..b29a4a7 100644 bool mIsFromCache; bool mCacheEntryAvailable; diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp -index 31aa582..25568bd 100644 +index 8f95076..22f3bba 100644 --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -97,6 +97,7 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI, @@ -82,7 +82,7 @@ index 31aa582..25568bd 100644 const PRUint32& loadFlags, const RequestHeaderTuples& requestHeaders, const nsHttpAtom& requestMethod, -@@ -118,6 +119,7 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI, +@@ -117,6 +118,7 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI, nsCOMPtr<nsIURI> originalUri(aOriginalURI); nsCOMPtr<nsIURI> docUri(aDocURI); nsCOMPtr<nsIURI> referrerUri(aReferrerURI); @@ -90,7 +90,7 @@ index 31aa582..25568bd 100644 nsCString uriSpec; uri->GetSpec(uriSpec); -@@ -145,6 +147,8 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI, +@@ -144,6 +146,8 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI, httpChan->SetDocumentURI(docUri); if (referrerUri) httpChan->SetReferrerInternal(referrerUri); @@ -100,7 +100,7 @@ index 31aa582..25568bd 100644 httpChan->SetLoadFlags(loadFlags); diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h -index 97eea07..e254589 100644 +index 9650aa9..2ac7e81 100644 --- a/netwerk/protocol/http/HttpChannelParent.h +++ b/netwerk/protocol/http/HttpChannelParent.h @@ -49,6 +49,7 @@ protected: @@ -112,7 +112,7 @@ index 97eea07..e254589 100644 const RequestHeaderTuples& requestHeaders, const nsHttpAtom& requestMethod, diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl -index b67e2c1..2b919cc 100644 +index 10af59f..6053541 100644 --- a/netwerk/protocol/http/PHttpChannel.ipdl +++ b/netwerk/protocol/http/PHttpChannel.ipdl @@ -35,6 +35,7 @@ parent: @@ -124,10 +124,10 @@ index b67e2c1..2b919cc 100644 RequestHeaderTuples requestHeaders, nsHttpAtom requestMethod, diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 529857b..73b54ce 100644 +index 9c10e3a..57afae4 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -1398,18 +1398,17 @@ nsHttpChannel::HandleAsyncRedirectChannelToHttps() +@@ -1396,18 +1396,17 @@ nsHttpChannel::HandleAsyncRedirectChannelToHttps() return; } @@ -149,7 +149,7 @@ index 529857b..73b54ce 100644 nsCOMPtr<nsIURI> upgradedURI; rv = mURI->Clone(getter_AddRefs(upgradedURI)); -@@ -1431,6 +1430,48 @@ nsHttpChannel::AsyncRedirectChannelToHttps() +@@ -1429,6 +1428,48 @@ nsHttpChannel::AsyncRedirectChannelToHttps() else upgradedURI->SetPort(oldPort); @@ -198,7 +198,7 @@ index 529857b..73b54ce 100644 nsCOMPtr<nsIIOService> ioService; rv = gHttpHandler->GetIOService(getter_AddRefs(ioService)); NS_ENSURE_SUCCESS(rv, rv); -@@ -1446,7 +1487,7 @@ nsHttpChannel::AsyncRedirectChannelToHttps() +@@ -1444,7 +1485,7 @@ nsHttpChannel::AsyncRedirectChannelToHttps() PRUint32 flags = nsIChannelEventSink::REDIRECT_PERMANENT; PushRedirectAsyncFunc( @@ -207,7 +207,7 @@ index 529857b..73b54ce 100644 rv = gHttpHandler->AsyncOnChannelRedirect(this, newChannel, flags); if (NS_SUCCEEDED(rv)) -@@ -1455,14 +1496,18 @@ nsHttpChannel::AsyncRedirectChannelToHttps() +@@ -1453,14 +1494,18 @@ nsHttpChannel::AsyncRedirectChannelToHttps() if (NS_FAILED(rv)) { AutoRedirectVetoNotifier notifier(this); PopRedirectAsyncFunc( @@ -229,7 +229,7 @@ index 529857b..73b54ce 100644 { AutoRedirectVetoNotifier notifier(this); -@@ -3910,6 +3955,12 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) +@@ -3905,6 +3950,12 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) if (mLoadGroup) mLoadGroup->AddRequest(this, nsnull); @@ -243,7 +243,7 @@ index 529857b..73b54ce 100644 // "http-on-modify-request" and load group observers that may set // mTimingEnabled flag. diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h -index 3d06ffd..60f52dd 100644 +index 0382b1c..2c50507 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h @@ -103,6 +103,8 @@ public: @@ -265,7 +265,7 @@ index 3d06ffd..60f52dd 100644 nsresult SetReferrerInternal(nsIURI *referrer) { nsCAutoString spec; nsresult rv = referrer->GetAsciiSpec(spec); -@@ -183,11 +188,13 @@ private: +@@ -173,11 +178,13 @@ private: // redirection specific methods void HandleAsyncRedirect(); @@ -279,7 +279,7 @@ index 3d06ffd..60f52dd 100644 virtual nsresult SetupReplacementChannel(nsIURI *, nsIChannel *, bool preserveMethod); // proxy specific methods -@@ -247,8 +254,8 @@ private: +@@ -237,8 +244,8 @@ private: bool MustValidateBasedOnQueryUrl(); void HandleAsyncRedirectChannelToHttps(); @@ -290,7 +290,7 @@ index 3d06ffd..60f52dd 100644 /** * A function that takes care of reading STS headers and enforcing STS -@@ -320,6 +327,7 @@ private: +@@ -310,6 +317,7 @@ private: friend class AutoRedirectVetoNotifier; friend class HttpAsyncAborter<nsHttpChannel>; nsCOMPtr<nsIURI> mRedirectURI;

1 0

[torbrowser/maint-2.3] Update patches for FF15.0.1.
by mikeperry＠torproject.org 08 Sep '12

08 Sep '12

commit 2077234f9c6b74b41a4d7d2c6a36455a039cd651 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 7 17:50:11 2012 -0700 Update patches for FF15.0.1. --- ...nents.interfaces-lookupMethod-from-conten.patch | 4 +- ...0002-Make-Permissions-Manager-memory-only.patch | 4 +- ...-Make-Intermediate-Cert-Store-memory-only.patch | 4 +- .../alpha/0004-Add-a-string-based-cacheKey.patch | 14 ++++---- .../0005-Block-all-plugins-except-flash.patch | 4 +- ...ontent-pref-service-memory-only-clearable.patch | 4 +- .../0007-Disable-SSL-Session-ID-tracking.patch | 4 +- ...ice-and-system-specific-CSS-Media-Queries.patch | 4 +- .../0009-Make-Download-manager-memory-only.patch | 4 +- .../0010-Add-DDG-and-StartPage-to-Omnibox.patch | 4 +- ...-nsICacheService.EvictEntries-synchronous.patch | 10 +++--- ...owser-exit-when-not-launched-from-Vidalia.patch | 4 +- ...13-Limit-the-number-of-fonts-per-document.patch | 4 +- ...observer-event-to-close-persistent-connec.patch | 14 ++++---- .../alpha/0015-Rebrand-Firefox-to-TorBrowser.patch | 4 +- .../alpha/0016-Prevent-WebSocket-DNS-leak.patch | 4 +- ...ize-HTTP-request-order-and-pipeline-depth.patch | 10 +++--- ...Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch | 4 +- ...9-Add-a-redirect-API-for-HTTPS-Everywhere.patch | 36 ++++++++++---------- 19 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/current-patches/firefox/alpha/0001-Block-Components.interfaces-lookupMethod-from-conten.patch b/src/current-patches/firefox/alpha/0001-Block-Components.interfaces-lookupMethod-from-conten.patch index 41da39d..921a716 100644 --- a/src/current-patches/firefox/alpha/0001-Block-Components.interfaces-lookupMethod-from-conten.patch +++ b/src/current-patches/firefox/alpha/0001-Block-Components.interfaces-lookupMethod-from-conten.patch @@ -1,7 +1,7 @@ -From d4c3ef2aadb70643bf0a3784cd5d9e9bb72481e1 Mon Sep 17 00:00:00 2001 +From caab8c136e806dcd913d637210ff187abb1b6b29 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:40:40 -0800 -Subject: [PATCH 01/20] Block Components.interfaces,lookupMethod from content +Subject: [PATCH 01/19] Block Components.interfaces,lookupMethod from content This patch removes the ability of content script to access Components.interfaces.* as well as call or access Components.lookupMethod. diff --git a/src/current-patches/firefox/alpha/0002-Make-Permissions-Manager-memory-only.patch b/src/current-patches/firefox/alpha/0002-Make-Permissions-Manager-memory-only.patch index 3dfb09b..d73f1ab 100644 --- a/src/current-patches/firefox/alpha/0002-Make-Permissions-Manager-memory-only.patch +++ b/src/current-patches/firefox/alpha/0002-Make-Permissions-Manager-memory-only.patch @@ -1,7 +1,7 @@ -From 59d440e340d37c95fe71396f420db13908df80d2 Mon Sep 17 00:00:00 2001 +From 12acd440d185f5536eed99084c4800a46d617197 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:45:16 -0800 -Subject: [PATCH 02/20] Make Permissions Manager memory-only +Subject: [PATCH 02/19] Make Permissions Manager memory-only This patch exposes a pref 'permissions.memory_only' that properly isolates the permissions manager to memory, which is responsible for all user specified diff --git a/src/current-patches/firefox/alpha/0003-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/firefox/alpha/0003-Make-Intermediate-Cert-Store-memory-only.patch index 6873aee..33cf5e9 100644 --- a/src/current-patches/firefox/alpha/0003-Make-Intermediate-Cert-Store-memory-only.patch +++ b/src/current-patches/firefox/alpha/0003-Make-Intermediate-Cert-Store-memory-only.patch @@ -1,7 +1,7 @@ -From 128b9ac61b08961bd606290c5a24231d4bf5622c Mon Sep 17 00:00:00 2001 +From a95872e8de8230e8e0128314acd335a7cb3510fb Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri, 19 Aug 2011 17:58:23 -0700 -Subject: [PATCH 03/20] Make Intermediate Cert Store memory-only. +Subject: [PATCH 03/19] Make Intermediate Cert Store memory-only. This patch makes the intermediate SSL cert store exist in memory only. diff --git a/src/current-patches/firefox/alpha/0004-Add-a-string-based-cacheKey.patch b/src/current-patches/firefox/alpha/0004-Add-a-string-based-cacheKey.patch index 3f01281..bbc6220 100644 --- a/src/current-patches/firefox/alpha/0004-Add-a-string-based-cacheKey.patch +++ b/src/current-patches/firefox/alpha/0004-Add-a-string-based-cacheKey.patch @@ -1,7 +1,7 @@ -From edf66166ab881d3cafc73ffcc8d2ec4b78ef42ed Mon Sep 17 00:00:00 2001 +From df164279499b23794a112de4305f3ed99a25da68 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 17:03:57 -0700 -Subject: [PATCH 04/20] Add a string-based cacheKey. +Subject: [PATCH 04/19] Add a string-based cacheKey. Used for isolating cache according to same-origin policy. --- @@ -29,10 +29,10 @@ index 96a8aef..b1c6f05 100644 * may fail if the disk cache is not present. The value of this attribute * is usually only settable during the processing of a channel's diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 0c8b530..529857b 100644 +index 290d04c..9c10e3a 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -2543,6 +2543,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, +@@ -2538,6 +2538,12 @@ nsHttpChannel::AssembleCacheKey(const char *spec, PRUint32 postID, cacheKey.Append(buf); } @@ -45,7 +45,7 @@ index 0c8b530..529857b 100644 if (!cacheKey.IsEmpty()) { cacheKey.AppendLiteral("uri="); } -@@ -4881,6 +4887,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value) +@@ -4876,6 +4882,22 @@ nsHttpChannel::SetCacheForOfflineUse(bool value) } NS_IMETHODIMP @@ -69,10 +69,10 @@ index 0c8b530..529857b 100644 { value = mOfflineCacheClientID; diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h -index 333e884..3d06ffd 100644 +index eaad05e..0382b1c 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h -@@ -302,6 +302,7 @@ private: +@@ -292,6 +292,7 @@ private: nsCOMPtr<nsICacheEntryDescriptor> mOfflineCacheEntry; nsCacheAccessMode mOfflineCacheAccess; nsCString mOfflineCacheClientID; diff --git a/src/current-patches/firefox/alpha/0005-Block-all-plugins-except-flash.patch b/src/current-patches/firefox/alpha/0005-Block-all-plugins-except-flash.patch index bc7afbb..79d92de 100644 --- a/src/current-patches/firefox/alpha/0005-Block-all-plugins-except-flash.patch +++ b/src/current-patches/firefox/alpha/0005-Block-all-plugins-except-flash.patch @@ -1,7 +1,7 @@ -From 20068bdda01cb2a1cd0f890fe2172887318ec20c Mon Sep 17 00:00:00 2001 +From 5c43ec0bcc08d82d7ea1895e2586028ff0c43db2 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 1 Feb 2012 15:50:15 -0800 -Subject: [PATCH 05/20] Block all plugins except flash. +Subject: [PATCH 05/19] Block all plugins except flash. We cannot use the @mozilla.org/extensions/blocklist;1 service, because we actually want to stop plugins from ever entering the browser's process space diff --git a/src/current-patches/firefox/alpha/0006-Make-content-pref-service-memory-only-clearable.patch b/src/current-patches/firefox/alpha/0006-Make-content-pref-service-memory-only-clearable.patch index f2bd23d..cc75ee1 100644 --- a/src/current-patches/firefox/alpha/0006-Make-content-pref-service-memory-only-clearable.patch +++ b/src/current-patches/firefox/alpha/0006-Make-content-pref-service-memory-only-clearable.patch @@ -1,7 +1,7 @@ -From b967a0bf9803f887876635cb0c40c66e900dec35 Mon Sep 17 00:00:00 2001 +From c1f6abc0766763e65c5e8b22f72171c5f8e4639b Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu, 8 Sep 2011 08:40:17 -0700 -Subject: [PATCH 06/20] Make content pref service memory-only + clearable +Subject: [PATCH 06/19] Make content pref service memory-only + clearable This prevents random urls from being inserted into content-prefs.sqllite in the profile directory as content prefs change (includes site-zoom and perhaps diff --git a/src/current-patches/firefox/alpha/0007-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/alpha/0007-Disable-SSL-Session-ID-tracking.patch index befce4a..5b8270a 100644 --- a/src/current-patches/firefox/alpha/0007-Disable-SSL-Session-ID-tracking.patch +++ b/src/current-patches/firefox/alpha/0007-Disable-SSL-Session-ID-tracking.patch @@ -1,7 +1,7 @@ -From a143df8693d811bde257a748ffc914aca38acb21 Mon Sep 17 00:00:00 2001 +From e3703799acddc621be9c64299070180721b489dc Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed, 7 Dec 2011 19:36:38 -0800 -Subject: [PATCH 07/20] Disable SSL Session ID tracking. +Subject: [PATCH 07/19] Disable SSL Session ID tracking. We can't easily bind SSL Session ID tracking to url bar domain, so we have to disable them to satisfy diff --git a/src/current-patches/firefox/alpha/0008-Limit-device-and-system-specific-CSS-Media-Queries.patch b/src/current-patches/firefox/alpha/0008-Limit-device-and-system-specific-CSS-Media-Queries.patch index 7276a46..1b7d396 100644 --- a/src/current-patches/firefox/alpha/0008-Limit-device-and-system-specific-CSS-Media-Queries.patch +++ b/src/current-patches/firefox/alpha/0008-Limit-device-and-system-specific-CSS-Media-Queries.patch @@ -1,7 +1,7 @@ -From 1bed42f67d1dd1a10693199448e495b155c44034 Mon Sep 17 00:00:00 2001 +From fdecb1911dd0bbd9bc611931c16026de17f6cbe9 Mon Sep 17 00:00:00 2001 From: Shondoit Walker <shondoit(a)gmail.com> Date: Mon, 4 Jun 2012 19:15:31 +0200 -Subject: [PATCH 08/20] Limit device- and system-specific CSS Media Queries +Subject: [PATCH 08/19] Limit device- and system-specific CSS Media Queries This is done to address https://www.torproject.org/projects/torbrowser/design/#fingerprinting-linka… diff --git a/src/current-patches/firefox/alpha/0009-Make-Download-manager-memory-only.patch b/src/current-patches/firefox/alpha/0009-Make-Download-manager-memory-only.patch index dfc54fd..6ee2744 100644 --- a/src/current-patches/firefox/alpha/0009-Make-Download-manager-memory-only.patch +++ b/src/current-patches/firefox/alpha/0009-Make-Download-manager-memory-only.patch @@ -1,7 +1,7 @@ -From 3788af0e0eee6639870de19a48178d9718542dc6 Mon Sep 17 00:00:00 2001 +From ec182e8a83826db0c2bae711d594a26cd0b08a22 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 25 Apr 2012 13:39:35 -0700 -Subject: [PATCH 09/20] Make Download manager memory only. +Subject: [PATCH 09/19] Make Download manager memory only. Solves https://trac.torproject.org/projects/tor/ticket/4017. diff --git a/src/current-patches/firefox/alpha/0010-Add-DDG-and-StartPage-to-Omnibox.patch b/src/current-patches/firefox/alpha/0010-Add-DDG-and-StartPage-to-Omnibox.patch index 50feb06..e9c6c2c 100644 --- a/src/current-patches/firefox/alpha/0010-Add-DDG-and-StartPage-to-Omnibox.patch +++ b/src/current-patches/firefox/alpha/0010-Add-DDG-and-StartPage-to-Omnibox.patch @@ -1,7 +1,7 @@ -From 78271fc762f49a74b762afa62b69d62f55bc5ab9 Mon Sep 17 00:00:00 2001 +From e58200766a98fc8e239c95eb19a0afcf9fcd6381 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed, 25 Apr 2012 15:03:46 -0700 -Subject: [PATCH 10/20] Add DDG and StartPage to Omnibox. +Subject: [PATCH 10/19] Add DDG and StartPage to Omnibox. You mean there are search engines that don't require captchas if you don't have a cookie? Holy crap. Get those in there now. diff --git a/src/current-patches/firefox/alpha/0011-Make-nsICacheService.EvictEntries-synchronous.patch b/src/current-patches/firefox/alpha/0011-Make-nsICacheService.EvictEntries-synchronous.patch index 9db46a6..879cfa6 100644 --- a/src/current-patches/firefox/alpha/0011-Make-nsICacheService.EvictEntries-synchronous.patch +++ b/src/current-patches/firefox/alpha/0011-Make-nsICacheService.EvictEntries-synchronous.patch @@ -1,7 +1,7 @@ -From fe734b407d4dca7e83cd08b918418b73af15fa8a Mon Sep 17 00:00:00 2001 +From b0f594e6130bf618a25d33d80f7b66d110449dc9 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 1 May 2012 15:02:03 -0700 -Subject: [PATCH 11/20] Make nsICacheService.EvictEntries synchronous +Subject: [PATCH 11/19] Make nsICacheService.EvictEntries synchronous This fixes a race condition that allows cache-based EverCookies to persist for a brief time (on the order of minutes?) after cache clearing/"New Identity". @@ -12,10 +12,10 @@ https://trac.torproject.org/projects/tor/ticket/5715 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp -index 709705e..d3af3fc 100644 +index 991cc34..ef2ad25 100644 --- a/netwerk/cache/nsCacheService.cpp +++ b/netwerk/cache/nsCacheService.cpp -@@ -1460,10 +1460,21 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor) +@@ -1506,10 +1506,21 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor) return NS_OK; } @@ -31,7 +31,7 @@ index 709705e..d3af3fc 100644 + if (storagePolicy == nsICache::STORE_ANYWHERE && + NS_IsMainThread() && gService && gService->mInitialized) { + nsCacheServiceAutoLock lock; -+ gService->DoomActiveEntries(nsnull); ++ gService->DoomActiveEntries(); + gService->ClearDoomList(); + (void) SyncWithCacheIOThread(); + } diff --git a/src/current-patches/firefox/alpha/0012-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch b/src/current-patches/firefox/alpha/0012-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch index a3d06cc..91a5347 100644 --- a/src/current-patches/firefox/alpha/0012-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch +++ b/src/current-patches/firefox/alpha/0012-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch @@ -1,7 +1,7 @@ -From 4d49aed78e8185f590060be473ab7e2013e6a792 Mon Sep 17 00:00:00 2001 +From 07ed1fba9d99b3aa860ab75f34c7650341c59b77 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 7 Jun 2012 14:45:26 -0700 -Subject: [PATCH 12/20] Make Tor Browser exit when not launched from Vidalia +Subject: [PATCH 12/19] Make Tor Browser exit when not launched from Vidalia Turns out the Windows 7 UI encourages users to "dock" their Tor Browser app for easy relaunch. If they manage to do this, we should fail closed rather diff --git a/src/current-patches/firefox/alpha/0013-Limit-the-number-of-fonts-per-document.patch b/src/current-patches/firefox/alpha/0013-Limit-the-number-of-fonts-per-document.patch index cf7aac9..95e3f48 100644 --- a/src/current-patches/firefox/alpha/0013-Limit-the-number-of-fonts-per-document.patch +++ b/src/current-patches/firefox/alpha/0013-Limit-the-number-of-fonts-per-document.patch @@ -1,7 +1,7 @@ -From a7917e7ceb3aebfc20f56fa64ec9780dd32f78e3 Mon Sep 17 00:00:00 2001 +From a94c453f1b68acddb84d1a97e10de3994dfdf2cd Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu, 7 Jun 2012 15:09:59 -0700 -Subject: [PATCH 13/20] Limit the number of fonts per document. +Subject: [PATCH 13/19] Limit the number of fonts per document. We create two prefs: browser.display.max_font_count and browser.display.max_font_attempts. diff --git a/src/current-patches/firefox/alpha/0014-Provide-an-observer-event-to-close-persistent-connec.patch b/src/current-patches/firefox/alpha/0014-Provide-an-observer-event-to-close-persistent-connec.patch index 9d50822..6f63876 100644 --- a/src/current-patches/firefox/alpha/0014-Provide-an-observer-event-to-close-persistent-connec.patch +++ b/src/current-patches/firefox/alpha/0014-Provide-an-observer-event-to-close-persistent-connec.patch @@ -1,7 +1,7 @@ -From f67aed29f53ef17aad69cba6d008df4f2d09d231 Mon Sep 17 00:00:00 2001 +From af43ed872bd64b623ea1d5b83926c4d06e8fcd7d Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Tue, 28 Aug 2012 18:03:22 -0700 -Subject: [PATCH 14/20] Provide an observer event to close persistent +Date: Fri, 7 Sep 2012 16:18:26 -0700 +Subject: [PATCH 14/19] Provide an observer event to close persistent connections We need to prevent linkability across "New Identity", which includes closing @@ -11,18 +11,18 @@ keep-alive connections. 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp -index 8b5533f..3647edc 100644 +index 2f71837..b066140 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp -@@ -307,6 +307,7 @@ nsHttpHandler::Init() - mObserverService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, true); +@@ -309,6 +309,7 @@ nsHttpHandler::Init() mObserverService->AddObserver(this, "net:clear-active-logins", true); + mObserverService->AddObserver(this, NS_PRIVATE_BROWSING_SWITCH_TOPIC, true); mObserverService->AddObserver(this, "net:prune-dead-connections", true); + mObserverService->AddObserver(this, "net:prune-all-connections", true); mObserverService->AddObserver(this, "net:failed-to-process-uri-content", true); } -@@ -1625,6 +1626,12 @@ nsHttpHandler::Observe(nsISupports *subject, +@@ -1651,6 +1652,12 @@ nsHttpHandler::Observe(nsISupports *subject, if (uri && mConnMgr) mConnMgr->ReportFailedToProcess(uri); } diff --git a/src/current-patches/firefox/alpha/0015-Rebrand-Firefox-to-TorBrowser.patch b/src/current-patches/firefox/alpha/0015-Rebrand-Firefox-to-TorBrowser.patch index 2829fa2..2a6a9c5 100644 --- a/src/current-patches/firefox/alpha/0015-Rebrand-Firefox-to-TorBrowser.patch +++ b/src/current-patches/firefox/alpha/0015-Rebrand-Firefox-to-TorBrowser.patch @@ -1,7 +1,7 @@ -From 883793ca836ce271f65ea6c31d27f41c7240ca59 Mon Sep 17 00:00:00 2001 +From d14732e7069aa8c33733f067e1e706bd852e3aba Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:05:11 -0700 -Subject: [PATCH 15/20] Rebrand Firefox to TorBrowser +Subject: [PATCH 15/19] Rebrand Firefox to TorBrowser This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. diff --git a/src/current-patches/firefox/alpha/0016-Prevent-WebSocket-DNS-leak.patch b/src/current-patches/firefox/alpha/0016-Prevent-WebSocket-DNS-leak.patch index bde4e62..3c0367d 100644 --- a/src/current-patches/firefox/alpha/0016-Prevent-WebSocket-DNS-leak.patch +++ b/src/current-patches/firefox/alpha/0016-Prevent-WebSocket-DNS-leak.patch @@ -1,7 +1,7 @@ -From 2bf15d1165f2d7aad286ab1591db318682ef4df2 Mon Sep 17 00:00:00 2001 +From 727bc1103bc663e1bc2a25bb4fb8e9c9fb31763b Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:07:37 -0700 -Subject: [PATCH 16/20] Prevent WebSocket DNS leak. +Subject: [PATCH 16/19] Prevent WebSocket DNS leak. This is due to an improper implementation of the WebSocket spec by Mozilla. diff --git a/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch index 8550cdd..76330a3 100644 --- a/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/alpha/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -1,7 +1,7 @@ -From fc8110586a4777dfd3cb93eb5544535f6bd7b0f3 Mon Sep 17 00:00:00 2001 +From c5b94226e50a5502ef7902e2d05874f36d678769 Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:08:27 -0700 -Subject: [PATCH 17/20] Randomize HTTP request order and pipeline depth. +Subject: [PATCH 17/19] Randomize HTTP request order and pipeline depth. This is an experimental defense against http://lorre.uni.lu/~andriy/papers/acmccs-wpes11-fingerprinting.pdf @@ -24,7 +24,7 @@ request order (though SPDY is still disabled by default in TBB). 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 60a6807..334c5fb 100644 +index 0bfaf3b..d565532 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -20,6 +20,8 @@ @@ -93,7 +93,7 @@ index 60a6807..334c5fb 100644 } nsHttpConnectionMgr::~nsHttpConnectionMgr() -@@ -1153,6 +1185,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap +@@ -1141,6 +1173,19 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap maxPersistConns = mMaxPersistConnsPerHost; } @@ -113,7 +113,7 @@ index 60a6807..334c5fb 100644 // use >= just to be safe bool result = (totalCount >= maxConns) || ( (caps & NS_HTTP_ALLOW_KEEPALIVE) && (persistCount >= maxPersistConns) ); -@@ -1319,6 +1364,11 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, +@@ -1307,6 +1352,11 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, maxdepth = PR_MIN(maxdepth, depthLimit); diff --git a/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch b/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch index 4bdffcc..109574a 100644 --- a/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch +++ b/src/current-patches/firefox/alpha/0018-Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch @@ -1,7 +1,7 @@ -From 40ffe7af2a41166a91f95fe145d3cb97527e4165 Mon Sep 17 00:00:00 2001 +From d705e4bb2b7efd4166d46d6fcb3183212902707c Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:22:32 -0700 -Subject: [PATCH 18/20] Adapt Steven Michaud's Mac crashfix patch +Subject: [PATCH 18/19] Adapt Steven Michaud's Mac crashfix patch Source is: https://bugzilla.mozilla.org/show_bug.cgi?id=715885#c35 diff --git a/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch b/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch index de0b3ad..7f8ac2d 100644 --- a/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch +++ b/src/current-patches/firefox/alpha/0019-Add-a-redirect-API-for-HTTPS-Everywhere.patch @@ -1,7 +1,7 @@ -From 704d06cc2310082c12abd7b8ccfbb71dae1c0a9f Mon Sep 17 00:00:00 2001 +From b5d6491427d18bbae057a2974ea80421163fbc0a Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 28 Aug 2012 18:30:22 -0700 -Subject: [PATCH 19/20] Add a redirect API for HTTPS-Everywhere. +Subject: [PATCH 19/19] Add a redirect API for HTTPS-Everywhere. --- netwerk/protocol/http/HttpChannelChild.cpp | 15 ++++- @@ -16,7 +16,7 @@ Subject: [PATCH 19/20] Add a redirect API for HTTPS-Everywhere. 9 files changed, 117 insertions(+), 12 deletions(-) diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp -index 691fee0..f22fa40 100644 +index cc88184..c26c8f4 100644 --- a/netwerk/protocol/http/HttpChannelChild.cpp +++ b/netwerk/protocol/http/HttpChannelChild.cpp @@ -1035,7 +1035,8 @@ HttpChannelChild::AsyncOpen(nsIStreamListener *listener, nsISupports *aContext) @@ -71,7 +71,7 @@ index 6b699c7..b29a4a7 100644 bool mIsFromCache; bool mCacheEntryAvailable; diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp -index 31aa582..25568bd 100644 +index 8f95076..22f3bba 100644 --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -97,6 +97,7 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI, @@ -82,7 +82,7 @@ index 31aa582..25568bd 100644 const PRUint32& loadFlags, const RequestHeaderTuples& requestHeaders, const nsHttpAtom& requestMethod, -@@ -118,6 +119,7 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI, +@@ -117,6 +118,7 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI, nsCOMPtr<nsIURI> originalUri(aOriginalURI); nsCOMPtr<nsIURI> docUri(aDocURI); nsCOMPtr<nsIURI> referrerUri(aReferrerURI); @@ -90,7 +90,7 @@ index 31aa582..25568bd 100644 nsCString uriSpec; uri->GetSpec(uriSpec); -@@ -145,6 +147,8 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI, +@@ -144,6 +146,8 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI& aURI, httpChan->SetDocumentURI(docUri); if (referrerUri) httpChan->SetReferrerInternal(referrerUri); @@ -100,7 +100,7 @@ index 31aa582..25568bd 100644 httpChan->SetLoadFlags(loadFlags); diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h -index 97eea07..e254589 100644 +index 9650aa9..2ac7e81 100644 --- a/netwerk/protocol/http/HttpChannelParent.h +++ b/netwerk/protocol/http/HttpChannelParent.h @@ -49,6 +49,7 @@ protected: @@ -112,7 +112,7 @@ index 97eea07..e254589 100644 const RequestHeaderTuples& requestHeaders, const nsHttpAtom& requestMethod, diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl -index b67e2c1..2b919cc 100644 +index 10af59f..6053541 100644 --- a/netwerk/protocol/http/PHttpChannel.ipdl +++ b/netwerk/protocol/http/PHttpChannel.ipdl @@ -35,6 +35,7 @@ parent: @@ -124,10 +124,10 @@ index b67e2c1..2b919cc 100644 RequestHeaderTuples requestHeaders, nsHttpAtom requestMethod, diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 529857b..73b54ce 100644 +index 9c10e3a..57afae4 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -1398,18 +1398,17 @@ nsHttpChannel::HandleAsyncRedirectChannelToHttps() +@@ -1396,18 +1396,17 @@ nsHttpChannel::HandleAsyncRedirectChannelToHttps() return; } @@ -149,7 +149,7 @@ index 529857b..73b54ce 100644 nsCOMPtr<nsIURI> upgradedURI; rv = mURI->Clone(getter_AddRefs(upgradedURI)); -@@ -1431,6 +1430,48 @@ nsHttpChannel::AsyncRedirectChannelToHttps() +@@ -1429,6 +1428,48 @@ nsHttpChannel::AsyncRedirectChannelToHttps() else upgradedURI->SetPort(oldPort); @@ -198,7 +198,7 @@ index 529857b..73b54ce 100644 nsCOMPtr<nsIIOService> ioService; rv = gHttpHandler->GetIOService(getter_AddRefs(ioService)); NS_ENSURE_SUCCESS(rv, rv); -@@ -1446,7 +1487,7 @@ nsHttpChannel::AsyncRedirectChannelToHttps() +@@ -1444,7 +1485,7 @@ nsHttpChannel::AsyncRedirectChannelToHttps() PRUint32 flags = nsIChannelEventSink::REDIRECT_PERMANENT; PushRedirectAsyncFunc( @@ -207,7 +207,7 @@ index 529857b..73b54ce 100644 rv = gHttpHandler->AsyncOnChannelRedirect(this, newChannel, flags); if (NS_SUCCEEDED(rv)) -@@ -1455,14 +1496,18 @@ nsHttpChannel::AsyncRedirectChannelToHttps() +@@ -1453,14 +1494,18 @@ nsHttpChannel::AsyncRedirectChannelToHttps() if (NS_FAILED(rv)) { AutoRedirectVetoNotifier notifier(this); PopRedirectAsyncFunc( @@ -229,7 +229,7 @@ index 529857b..73b54ce 100644 { AutoRedirectVetoNotifier notifier(this); -@@ -3910,6 +3955,12 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) +@@ -3905,6 +3950,12 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) if (mLoadGroup) mLoadGroup->AddRequest(this, nsnull); @@ -243,7 +243,7 @@ index 529857b..73b54ce 100644 // "http-on-modify-request" and load group observers that may set // mTimingEnabled flag. diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h -index 3d06ffd..60f52dd 100644 +index 0382b1c..2c50507 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h @@ -103,6 +103,8 @@ public: @@ -265,7 +265,7 @@ index 3d06ffd..60f52dd 100644 nsresult SetReferrerInternal(nsIURI *referrer) { nsCAutoString spec; nsresult rv = referrer->GetAsciiSpec(spec); -@@ -183,11 +188,13 @@ private: +@@ -173,11 +178,13 @@ private: // redirection specific methods void HandleAsyncRedirect(); @@ -279,7 +279,7 @@ index 3d06ffd..60f52dd 100644 virtual nsresult SetupReplacementChannel(nsIURI *, nsIChannel *, bool preserveMethod); // proxy specific methods -@@ -247,8 +254,8 @@ private: +@@ -237,8 +244,8 @@ private: bool MustValidateBasedOnQueryUrl(); void HandleAsyncRedirectChannelToHttps(); @@ -290,7 +290,7 @@ index 3d06ffd..60f52dd 100644 /** * A function that takes care of reading STS headers and enforcing STS -@@ -320,6 +327,7 @@ private: +@@ -310,6 +317,7 @@ private: friend class AutoRedirectVetoNotifier; friend class HttpAsyncAborter<nsHttpChannel>; nsCOMPtr<nsIURI> mRedirectURI;

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 07 Sep '12

07 Sep '12

commit ba166e81ac8383ea87000dcd85884850fcb777ea Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 7 19:45:11 2012 +0000 Update translations for vidalia --- sk/vidalia_sk.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sk/vidalia_sk.po b/sk/vidalia_sk.po index a59dd14..f17bb13 100644 --- a/sk/vidalia_sk.po +++ b/sk/vidalia_sk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-09-05 19:06+0000\n" +"PO-Revision-Date: 2012-09-07 19:32+0000\n" "Last-Translator: K0L0M4N <koloman375(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2055,7 +2055,7 @@ msgstr "" msgctxt "MainWindow" msgid "Update Failed" -msgstr "" +msgstr "Aktualizácia Zlyhala" msgctxt "MainWindow" msgid "Your software is up to date"

1 0

[tor/master] Fix whitespace in Makefile.am
by nickm＠torproject.org 07 Sep '12

07 Sep '12

commit 2cde6658b5998561e9e8a9377976db87690a2387 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 7 14:46:03 2012 -0400 Fix whitespace in Makefile.am --- Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index aa6f6c4..787be49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ EXTRA_DIST+= \ LICENSE \ Makefile.nmake \ README \ - ReleaseNotes + ReleaseNotes #install-data-local: # $(INSTALL) -m 755 -d $(LOCALSTATEDIR)/lib/tor

1 0