April 2013 - tor-commits - lists.torproject.org

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 01 Apr '13

01 Apr '13

commit f55e3baacbbb4ce5d1ead7552a98776815a2dd7f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 1 11:16:01 2013 +0000 Update translations for whisperback_completed --- pl/pl.po | 178 +++++++++++++++++++++++--------------------------------------- 1 files changed, 66 insertions(+), 112 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index 13102b1..ca571f9 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <bog.d(a)gazeta.pl>, 2013. # EJI <ewa.infeld(a)gmail.com>, 2013. # Eva Infeld <ewa.infeld(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2012-02-16 22:33+0100\n" -"PO-Revision-Date: 2013-01-30 20:18+0000\n" -"Last-Translator: Quaithe <ewa.infeld(a)gmail.com>\n" +"POT-Creation-Date: 2013-03-26 15:50+0100\n" +"PO-Revision-Date: 2013-04-01 10:49+0000\n" +"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,85 +35,47 @@ msgstr "Błedny klucz OpenPGP: %s" msgid "Invalid contact OpenPGP public key block" msgstr "Błedny klucz publiczny OpenPGP." -#: ../whisperBack/encryption.py:126 -msgid "No keys found." -msgstr "Nie znaleziono klucza." - #: ../whisperBack/exceptions.py:41 #, python-format msgid "" -"The variable %s was not found in any of the configuation " -"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "Zmienna %s nie została znaleziona w konfiguracji files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" - -#: ../whisperBack/gui.py:114 -msgid "Name of the affected software" -msgstr "Nazwa programu z którym jest problem" - -#: ../whisperBack/gui.py:115 -msgid "Exact steps to reproduce the problem" -msgstr "Dokładna instrucja jak zrekonstruować problem" - -#: ../whisperBack/gui.py:116 -msgid "Actual result / the problem" -msgstr "Rezultat/problem" - -#: ../whisperBack/gui.py:117 -msgid "Desired result" -msgstr "Pożądany rezultat" +"The %s variable was not found in any of the configuration files " +"/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "Nie znaleziono zmiennej %s w żadnym pliku konfiguracyjnym /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -#: ../whisperBack/gui.py:155 +#: ../whisperBack/gui.py:151 msgid "Unable to load a valid configuration." msgstr "Nie udało się zaladować dzialającej konfiguracji." -#: ../whisperBack/gui.py:177 -#, python-format -msgid "" -"<h1>Help us fix your bug!</h1>\n" -"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n" -"<p><strong>Do not include more personal information than\n" -"needed!</strong></p>\n" -"<h2>About giving us an email address</h2>\n" -"<p>If you don't mind disclosing some bits of your identity\n" -"to Tails developers, you can provide an email address to\n" -"let us ask more details about the bug. Additionally entering\n" -"a public PGP key enables us to encrypt such future\n" -"communication.</p>\n" -"<p>Anyone who can see this reply will probably infer you are\n" -"a Tails user. Time to wonder how much you trust your\n" -"Internet and mailbox providers?</p>\n" -msgstr "<h1>Pomóż nam naprawić swój problem!</h1>⏎ <p>Przeczytaj <a href=\"%s\">instrukcje jak zgłosić problem</a>.</p>⏎ <p><strong>Nie ujawniaj wiecej informacji o sobie niż to \nkonieczne!</strong></p>⏎ <h2>Jeżeli chcesz podac adres email</h2>\n<p>Jeżeli zgadzasz sie na częściowe ujawnienie swojej tożsamości\ndeweloperom Tails, możesz podac adres email\nżebysmy mogli zadawać Ci pytania dotyczące problemu. Ponadto, jeżeli podasz\nklucz publiczny PGP umożliwisz nam szyfrowanie tego typu \nkomunikacji.</p>\n<p>Kazdy kto zobaczy ta odpowiedx domyśli się, że jesteś\nurzytkownijiem Tails. Zastanow sie czy ufasz swoim operattorom\nintenetu i poczty.</p>\n" - -#: ../whisperBack/gui.py:229 +#: ../whisperBack/gui.py:217 msgid "Sending mail..." msgstr "Wysyłanie..." -#: ../whisperBack/gui.py:230 +#: ../whisperBack/gui.py:218 msgid "Sending mail" msgstr "Wysyłanie" #. pylint: disable=C0301 -#: ../whisperBack/gui.py:232 +#: ../whisperBack/gui.py:220 msgid "This could take a while..." msgstr "To może chwilę potrwać..." -#: ../whisperBack/gui.py:246 +#: ../whisperBack/gui.py:234 msgid "The contact email adress doesn't seem valid." msgstr "Adres email wygląda na błędny." -#: ../whisperBack/gui.py:263 +#: ../whisperBack/gui.py:251 msgid "Unable to send the mail: SMTP error." msgstr "Nie można wysłać poczty: błąd SMTP." -#: ../whisperBack/gui.py:265 +#: ../whisperBack/gui.py:253 msgid "Unable to connect to the server." msgstr "Nie można połączyc się z serwerem." -#: ../whisperBack/gui.py:267 +#: ../whisperBack/gui.py:255 msgid "Unable to create or to send the mail." msgstr "Nie można utworzyc lub wysłać poczty." -#: ../whisperBack/gui.py:270 +#: ../whisperBack/gui.py:258 msgid "" "\n" "\n" @@ -121,25 +84,21 @@ msgid "" "If it does not work, you will be offered to save the bug report." msgstr "\n\nNie można wysłać zawiadomienia o błędzie, prawdopodobnie przez problemy z siecią. Postaraj sie połączyć z siecią ponownie i kliknąć wyślij. \n\nJeżeli to nie zadziała, będziesz miał(a) mozliwość zachowania raportu o błędzie." -#: ../whisperBack/gui.py:283 +#: ../whisperBack/gui.py:271 msgid "Your message has been sent." msgstr "Wiadomość została wysłana." -#: ../whisperBack/gui.py:289 -msgid "Unable to find encryption key." -msgstr "Nie można znaleźć klucza szyfrowania." - -#: ../whisperBack/gui.py:293 +#: ../whisperBack/gui.py:278 msgid "An error occured during encryption." msgstr "Wystąpił błąd podczas szyfrowania." -#: ../whisperBack/gui.py:313 +#: ../whisperBack/gui.py:298 #, python-format msgid "Unable to save %s." msgstr "Nie można zapisać %s." #. XXX: fix string -#: ../whisperBack/gui.py:337 +#: ../whisperBack/gui.py:322 #, python-format msgid "" "The bug report could not be sent, likely due to network problems.\n" @@ -149,70 +108,39 @@ msgid "" "Do you want to save the bug report to a file?" msgstr "Nie można wysłać komunikatu o błędzie, prawdopodobnie ze wzgęldu na problemy z siecią.\n\nAby to obejść, możesz zapisać raport o błędzie jako plik na dysku USB i spróbować wyslać go z twojego konta email na %s używając innego systemu. Pamiętaj, że w ten sposób Twój raport nie będzie anonimowy, chyba że postarasz sie aby był (na przyklad uzywając Tor z jednorazowym kontem email).\n\nCzy chcesz zapisać raport błędu jako plik?" -#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 +#: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 msgid "WhisperBack" msgstr "WhisperBack" -#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8 +#: ../whisperBack/gui.py:387 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail." msgstr "Wyślij nam Swoje uwagi w zaszyfrowanym emailu." -#: ../whisperBack/gui.py:405 +#: ../whisperBack/gui.py:390 msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" msgstr "Copyright © 2009-2012 deweloperzy Tails (tails(a)boum.org)" -#: ../whisperBack/gui.py:406 +#: ../whisperBack/gui.py:391 msgid "Tails developers <tails(a)boum.org>" msgstr "Deweloperzy Tails <tails(a)boum.org>" -#: ../whisperBack/gui.py:407 +#: ../whisperBack/gui.py:392 msgid "translator-credits" msgstr "tłumaczenie" -#: ../whisperBack/gui.py:434 -msgid "This doesn's seem to be a valid URL or OpenPGP key." -msgstr "URL lub klucz OpenPGP wydaje się błędny." +#: ../whisperBack/gui.py:419 +msgid "This doesn't seem to be a valid URL or OpenPGP key." +msgstr "To nie wygląda na prawidłowy adres URL lub klucz OpenPGP." #: ../data/whisperback.ui.h:1 -msgid "" -"Add a PGP key if you want us to encrypt messages when we respond to you." -msgstr "Dodaj klucz PGP jeżeli chcesz aby nasza odpowiedź była zaszyfrowana." - -#: ../data/whisperback.ui.h:2 -msgid "Bug description" -msgstr "Opis błędu" - -#: ../data/whisperback.ui.h:3 msgid "Copyright © 2009-2012 tails(a)boum.org" msgstr "Copyright © 2009-2012 tails(a)boum.org" -#: ../data/whisperback.ui.h:4 -msgid "Help" -msgstr "Pomoc" - -#: ../data/whisperback.ui.h:5 -msgid "" -"If you want us to encrypt messages when we respond to you, add your key ID, " -"a link to your key, or the key as a public key block:" -msgstr "Jeżeli chcesz, żeby nasza odpowiedź była zaszyfrowana, podaj identyfikator Twojego klucza, link do klucza lub klucz publiczny:" - -#: ../data/whisperback.ui.h:6 -msgid "Optional email address to contact you" -msgstr "(Opcjonalne) Adres email pod którym można sie z Toba skontaktować:" - -#: ../data/whisperback.ui.h:7 -msgid "Send" -msgstr "Wyslij" - -#: ../data/whisperback.ui.h:9 -msgid "Summary" -msgstr "Podsumowanie" - -#: ../data/whisperback.ui.h:10 -msgid "Technical details to include" -msgstr "Szczegóły techniczne do zawarcia" +#: ../data/whisperback.ui.h:3 +msgid "https://tails.boum.org/" +msgstr "https://tails.boum.org/" -#: ../data/whisperback.ui.h:12 +#: ../data/whisperback.ui.h:4 msgid "" "WhisperBack - Send feedback in an encrypted mail\n" "Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" @@ -231,18 +159,44 @@ msgid "" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" msgstr "WhisperBack - Wyślij opinię w zaszywrowanym emailu\nCopyright (C) 2009-2012 deweloperzy Tails <tails(a)boum.org>\n\nTen program jest darmowy, może byc kopiowany i modyfikowany\nwedług wytycznych GNU general Public License opublikowanych przez\nFree Software Foundation; wersja trzecia licencji lub dowolna późniejsza.\n\nRozpowszechniając ten program, mamy nadzieje że będzie on przydatny lecz\nBEZ ŻADNEJ GWARANCJI; bez nawet domniemanej gwarancji\nPRZYDATNOŚCI HANDLOWEJ lub SPELNIANIA KONKRETYCH FUNKCJI. Szczegóły dostępne w GNU\nGeneral Public License.\n\nPowinienes byl otrzymac egzemplarz GNU General Public License razem z kopia programu. Jezeli tak sie nie stało, odwolaj sie do <http://www.gnu.org/licenses/>.\n" +#: ../data/whisperback.ui.h:20 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "Jeżeli chcesz, żeby nasza odpowiedź była zaszyfrowana, podaj identyfikator Twojego klucza, link do klucza lub klucz publiczny:" + +#: ../data/whisperback.ui.h:22 +msgid "Summary" +msgstr "Podsumowanie" + +#: ../data/whisperback.ui.h:23 +msgid "Bug description" +msgstr "Opis błędu" + +#: ../data/whisperback.ui.h:24 +msgid "Optional email address to contact you" +msgstr "(Opcjonalne) Adres email pod którym można sie z Toba skontaktować:" + +#: ../data/whisperback.ui.h:25 +msgid "optional PGP key" +msgstr "(opcjonalne) klucz PGP" + +#: ../data/whisperback.ui.h:26 +msgid "Technical details to include" +msgstr "Szczegóły techniczne do zawarcia" + +#: ../data/whisperback.ui.h:27 +msgid "headers" +msgstr "Nagłówki" + #: ../data/whisperback.ui.h:28 msgid "debugging info" msgstr "Informacje o debugowaniu" #: ../data/whisperback.ui.h:29 -msgid "headers" -msgstr "Nagłówki" +msgid "Help" +msgstr "Pomoc" #: ../data/whisperback.ui.h:30 -msgid "https://tails.boum.org/" -msgstr "https://tails.boum.org/" - -#: ../data/whisperback.ui.h:31 -msgid "optional PGP key" -msgstr "(opcjonalne) klucz PGP" +msgid "Send" +msgstr "Wyslij"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 01 Apr '13

01 Apr '13

commit ec36539aef21825b1e759415c24710978b951338 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 1 11:15:56 2013 +0000 Update translations for whisperback --- pl/pl.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index 3f7e28b..ca571f9 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <bog.d(a)gazeta.pl>, 2013. # EJI <ewa.infeld(a)gmail.com>, 2013. # Eva Infeld <ewa.infeld(a)gmail.com>, 2013. msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-03-27 08:21+0000\n" -"Last-Translator: Quaithe <ewa.infeld(a)gmail.com>\n" +"PO-Revision-Date: 2013-04-01 10:49+0000\n" +"Last-Translator: bogdrozd <bog.d(a)gazeta.pl>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +40,7 @@ msgstr "Błedny klucz publiczny OpenPGP." msgid "" "The %s variable was not found in any of the configuration files " "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "" +msgstr "Nie znaleziono zmiennej %s w żadnym pliku konfiguracyjnym /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" #: ../whisperBack/gui.py:151 msgid "Unable to load a valid configuration." @@ -129,7 +130,7 @@ msgstr "tłumaczenie" #: ../whisperBack/gui.py:419 msgid "This doesn't seem to be a valid URL or OpenPGP key." -msgstr "" +msgstr "To nie wygląda na prawidłowy adres URL lub klucz OpenPGP." #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2012 tails(a)boum.org"

1 0

[torbrowser/master] add geoip6 files to alpha bundles
by mikeperry＠torproject.org 01 Apr '13

01 Apr '13

commit b6b517e34ef295983b10fefe77e834be1e2e1c8c Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Mar 19 15:50:39 2013 -0400 add geoip6 files to alpha bundles --- build-scripts/config/alpha/torrc | 1 + build-scripts/config/alpha/torrc-linux | 2 +- build-scripts/config/alpha/torrc-osx | 1 + build-scripts/linux-alpha.mk | 1 + build-scripts/osx-alpha.mk | 1 + build-scripts/windows-alpha.mk | 1 + 6 files changed, 6 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/alpha/torrc b/build-scripts/config/alpha/torrc index 16f9486..1c79def 100644 --- a/build-scripts/config/alpha/torrc +++ b/build-scripts/config/alpha/torrc @@ -3,6 +3,7 @@ AvoidDiskWrites 1 # Store working data, state, keys, and caches here. DataDirectory .\Data\Tor GeoIPFile .\Data\Tor\geoip +GeoIPv6File .\Data\Tor\geoip6 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME). Log notice stdout diff --git a/build-scripts/config/alpha/torrc-linux b/build-scripts/config/alpha/torrc-linux index 7d11921..aea57fd 100644 --- a/build-scripts/config/alpha/torrc-linux +++ b/build-scripts/config/alpha/torrc-linux @@ -2,7 +2,7 @@ AvoidDiskWrites 1 # Store working data, state, keys, and caches here. DataDirectory ./Data/Tor -GeoIPFile ./Data/Tor/geoip +GeoIPv6File ./Data/Tor/geoip6 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME). Log notice stdout diff --git a/build-scripts/config/alpha/torrc-osx b/build-scripts/config/alpha/torrc-osx index f9c71d5..877c70b 100644 --- a/build-scripts/config/alpha/torrc-osx +++ b/build-scripts/config/alpha/torrc-osx @@ -3,6 +3,7 @@ AvoidDiskWrites 1 # Store working data, state, keys, and caches here. DataDirectory ../../Contents/Resources/Data/Tor GeoIPFile ../../Contents/Resources/Data/Tor/geoip +GeoIPv6File ../../Contents/Resources/Data/Tor/geoip6 # Where to send logging messages. Format is minSeverity[-maxSeverity] # (stderr|stdout|syslog|file FILENAME). Log notice stdout diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index b8e1c7a..7121474 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -362,6 +362,7 @@ else cp config/alpha/torrc-linux $(DEST)/Data/Tor/torrc endif cp $(TOR_DIR)/src/config/geoip $(DEST)/Data/Tor/geoip + cp $(TOR_DIR)/src/config/geoip6 $(DEST)/Data/Tor/geoip6 chmod 700 $(DEST)/Data/Tor # We've replaced the custom C program with a shell script for now... diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 7edbc40..7ad744d 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -369,6 +369,7 @@ else cp config/alpha/torrc-osx $(DEST)/Library/Vidalia/torrc endif cp $(TOR_DIR)/src/config/geoip $(DEST)/Contents/Resources/Data/Tor/geoip + cp $(TOR_DIR)/src/config/geoip6 $(DEST)/Contents/Resources/Data/Tor/geoip6 chmod 700 $(DATADIR)/Tor # We've replaced the custom C program with a shell script for now... diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 02424ec..56233c4 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -374,6 +374,7 @@ else cp config/alpha/torrc $(DEST)/Data/Tor/torrc endif cp $(TOR)/src/config/geoip $(DEST)/Data/Tor + cp $(TOR)/src/config/geoip6 $(DEST)/Data/Tor launcher: cd ../src/RelativeLink/ && $(MAKE)

1 0

[torbrowser/master] bump Firefox to 17.0.5esr
by mikeperry＠torproject.org 01 Apr '13

01 Apr '13

commit e1d0d534f2a672cc1bfa9611c84bfff77d033586 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Mar 30 20:08:06 2013 -0400 bump Firefox to 17.0.5esr --- build-scripts/linux-alpha.mk | 2 +- build-scripts/linux.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions-alpha.mk | 4 ++-- build-scripts/versions.mk | 4 ++-- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 7121474..3a15d53 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d72fd28..2bcbb9a 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 7ad744d..1429c5b 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index dda7f4f..4215627 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 59a2989..c4ed4e0 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -10,10 +10,10 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.11-alpha PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.4esr +FIREFOX_VER=17.0.5esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.1 -NOSCRIPT_VER=2.6.5.8 +NOSCRIPT_VER=2.6.5.9 HTTPSEVERYWHERE_VER=4.0development.6 PDFJS_VER=0.7.236 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 884dd32..d226473 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -10,10 +10,10 @@ VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.4esr +FIREFOX_VER=17.0.5esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.1 -NOSCRIPT_VER=2.6.5.8 +NOSCRIPT_VER=2.6.5.9 HTTPSEVERYWHERE_VER=3.1.4 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 56233c4..76bd01e 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a9db5c0..9fb6a2b 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Windows ## Location of required libraries

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 01 Apr '13

01 Apr '13

commit 60b1fd96a060982210b88bb0d4b8d0759164da79 Merge: aec197e a3903bc Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Mar 31 23:04:57 2013 -0700 Merge branch 'maint-2.4' .../0008-Disable-SSL-Session-ID-tracking.patch | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)

1 0

[torbrowser/master] Fix SSL Session ID patch for FF17.0.5-esr.
by mikeperry＠torproject.org 01 Apr '13

01 Apr '13

commit a3903bca01db47226c909e0880c4f3c089fcd0e0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Mar 31 23:04:24 2013 -0700 Fix SSL Session ID patch for FF17.0.5-esr. --- .../0008-Disable-SSL-Session-ID-tracking.patch | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch index 1a20c3a..494c765 100644 --- a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch +++ b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch @@ -1,6 +1,6 @@ -From 0cdbc52ac00f33e532b5485cf12286a1dc11b981 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Wed, 7 Dec 2011 19:36:38 -0800 +From e700063f5d18e86077af8ecf7fb3f4d92f2d0ef4 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Sun, 31 Mar 2013 22:48:00 -0700 Subject: [PATCH 08/27] Disable SSL Session ID tracking. We can't easily bind SSL Session ID tracking to url bar domain, @@ -8,21 +8,21 @@ so we have to disable them to satisfy https://www.torproject.org/projects/torbrowser/design/#identifier-linkabili…. --- security/nss/lib/ssl/sslsock.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c -index 0c4d0c7..8d23fc0 100644 +index 4f4b034..6ce5d11 100644 --- a/security/nss/lib/ssl/sslsock.c +++ b/security/nss/lib/ssl/sslsock.c -@@ -173,7 +173,7 @@ static sslOptions ssl_defaults = { +@@ -141,7 +141,7 @@ static sslOptions ssl_defaults = { PR_FALSE, /* enableSSL2 */ /* now defaults to off in NSS 3.13 */ - PR_TRUE, /* enableSSL3 */ - PR_TRUE, /* enableTLS */ /* now defaults to on in NSS 3.0 */ + PR_FALSE, /* unusedBit9 */ + PR_FALSE, /* unusedBit10 */ - PR_FALSE, /* noCache */ + PR_TRUE, /* noCache */ PR_FALSE, /* fdx */ PR_FALSE, /* v2CompatibleHello */ /* now defaults to off in NSS 3.13 */ PR_TRUE, /* detectRollBack */ -- -1.7.5.4 +1.7.9.5

1 0

[torbrowser/maint-2.4] Fix SSL Session ID patch for FF17.0.5-esr.
by mikeperry＠torproject.org 01 Apr '13

01 Apr '13

commit a3903bca01db47226c909e0880c4f3c089fcd0e0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Mar 31 23:04:24 2013 -0700 Fix SSL Session ID patch for FF17.0.5-esr. --- .../0008-Disable-SSL-Session-ID-tracking.patch | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch index 1a20c3a..494c765 100644 --- a/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch +++ b/src/current-patches/firefox/0008-Disable-SSL-Session-ID-tracking.patch @@ -1,6 +1,6 @@ -From 0cdbc52ac00f33e532b5485cf12286a1dc11b981 Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)fscked.org> -Date: Wed, 7 Dec 2011 19:36:38 -0800 +From e700063f5d18e86077af8ecf7fb3f4d92f2d0ef4 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Sun, 31 Mar 2013 22:48:00 -0700 Subject: [PATCH 08/27] Disable SSL Session ID tracking. We can't easily bind SSL Session ID tracking to url bar domain, @@ -8,21 +8,21 @@ so we have to disable them to satisfy https://www.torproject.org/projects/torbrowser/design/#identifier-linkabili…. --- security/nss/lib/ssl/sslsock.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c -index 0c4d0c7..8d23fc0 100644 +index 4f4b034..6ce5d11 100644 --- a/security/nss/lib/ssl/sslsock.c +++ b/security/nss/lib/ssl/sslsock.c -@@ -173,7 +173,7 @@ static sslOptions ssl_defaults = { +@@ -141,7 +141,7 @@ static sslOptions ssl_defaults = { PR_FALSE, /* enableSSL2 */ /* now defaults to off in NSS 3.13 */ - PR_TRUE, /* enableSSL3 */ - PR_TRUE, /* enableTLS */ /* now defaults to on in NSS 3.0 */ + PR_FALSE, /* unusedBit9 */ + PR_FALSE, /* unusedBit10 */ - PR_FALSE, /* noCache */ + PR_TRUE, /* noCache */ PR_FALSE, /* fdx */ PR_FALSE, /* v2CompatibleHello */ /* now defaults to off in NSS 3.13 */ PR_TRUE, /* detectRollBack */ -- -1.7.5.4 +1.7.9.5

1 0