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

r26400: {website} fix up the job desc to avoid nuisances. (website/trunk/about/en)
by Andrew Lewman 30 Oct '13

30 Oct '13

Author: phobos Date: 2013-10-30 23:12:56 +0000 (Wed, 30 Oct 2013) New Revision: 26400 Modified: website/trunk/about/en/jobs-browserhacker.wml Log: fix up the job desc to avoid nuisances. Modified: website/trunk/about/en/jobs-browserhacker.wml =================================================================== --- website/trunk/about/en/jobs-browserhacker.wml 2013-10-30 18:43:53 UTC (rev 26399) +++ website/trunk/about/en/jobs-browserhacker.wml 2013-10-30 23:12:56 UTC (rev 26400) @@ -19,8 +19,7 @@ browser</a>, writing new APIs and altering functionality for privacy and security, and making improvements to our collection of Firefox and Thunderbird addons. This -would be a full-time contractor position likely starting in November/December -and going through Q3 2014, with the possibility of later in 2014 and beyond. +would be a short-term contract position. </p> @@ -135,10 +134,9 @@ </p> <ul> - <li>Tor developers don't have an office; you can work from - wherever you want, in basically any country. You'll need to be - comfortable in this environment! We coordinate via IRC, email, - and bug trackers.</li> + <li>Tor developers can work from wherever you want, in + basically any country. We have an office in Cambridge, MA if you + prefer. We coordinate via IRC, email, and bug trackers.</li> <li>Academic degrees are great, but not required if you have the right experience.</li> <li>We only write free and open source software, and we don't

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 30 Oct '13

30 Oct '13

commit fea011e1009395343f0f1c969008eec45fe600f8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 30 22:46:14 2013 +0000 Update translations for tor-launcher-properties_completed --- pt/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/pt/torlauncher.properties b/pt/torlauncher.properties index ca8df01..c36ee16 100644 --- a/pt/torlauncher.properties +++ b/pt/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Iniciador Tor torlauncher.tor_exited=O Tor fechou-se insperadamente. +torlauncher.please_restart_app=Por favor reinicie a aplicação. torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor. torlauncher.tor_failed_to_start=O Tor falhou a inicialização. torlauncher.tor_bootstrap_failed=o Tor não conseguiu ligar-se à rede Tor.\n\n %S

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 30 Oct '13

30 Oct '13

commit 6f7610a46c71634dcf673846f9de760f3d5106f4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 30 22:46:12 2013 +0000 Update translations for tor-launcher-properties --- pt/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/torlauncher.properties b/pt/torlauncher.properties index 6a0f13a..c36ee16 100644 --- a/pt/torlauncher.properties +++ b/pt/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Iniciador Tor torlauncher.tor_exited=O Tor fechou-se insperadamente. -# torlauncher.please_restart_app=Please restart this application. +torlauncher.please_restart_app=Por favor reinicie a aplicação. torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor. torlauncher.tor_failed_to_start=O Tor falhou a inicialização. torlauncher.tor_bootstrap_failed=o Tor não conseguiu ligar-se à rede Tor.\n\n %S

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 30 Oct '13

30 Oct '13

commit 66e9b57a3691d821f5d480ca25731a654ea4a701 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 30 22:46:06 2013 +0000 Update translations for torbirdy --- pt/torbirdy.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt/torbirdy.dtd b/pt/torbirdy.dtd index f1e976b..6065765 100644 --- a/pt/torbirdy.dtd +++ b/pt/torbirdy.dtd @@ -16,8 +16,8 @@ <!ENTITY torbirdy.prefs.extra2.key "d"> <!ENTITY torbirdy.prefs.testproxy.button "Testar Configurações de Proxy"> <!ENTITY torbirdy.prefs.testproxy.key "n"> -<!ENTITY torbirdy.prefs.proxy.label ""> -<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Definições de Privacidade"> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label ""> <!ENTITY torbirdy.prefs.recommended.text "Use as configurações de proxy recomendadas para o TorBirdy (Tor)"> @@ -46,7 +46,7 @@ <!ENTITY torbirdy.prefs.emailwizard.label "Ative o assistente de configuração automática de email, do Thunderbird [por defeito: desativado]"> <!ENTITY torbirdy.prefs.emailwizard.key "w"> <!ENTITY torbirdy.prefs.automatic.label ""> -<!ENTITY torbirdy.prefs.automatic.key ""> +<!ENTITY torbirdy.prefs.automatic.key "f"> <!ENTITY torbirdy.prefs.renegotiation.label "Permitir ligações a servidores que não suportem SSL/TLS com renegociação segura [por defeito: não permitir]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Específico-da-Conta">

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 30 Oct '13

30 Oct '13

commit 7504aaaaba820d6792429448a0fb6b9a86b84e86 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 30 22:45:59 2013 +0000 Update translations for liveusb-creator_completed --- pt/pt.po | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 3ad5f07..18fad0f 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -4,14 +4,15 @@ # # Translators: # SonhosDigitais <sonhosdigitais(a)gmx.com>, 2013 +# kohpyreit <kohpyreit(a)gmail.com>, 2013 # Valter Fukuoka <dotsoft(a)gmail.com>, 2008 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-08-07 16:08+0200\n" -"PO-Revision-Date: 2013-08-15 14:10+0000\n" -"Last-Translator: SonhosDigitais <sonhosdigitais(a)gmx.com>\n" +"POT-Creation-Date: 2013-09-09 11:21+0200\n" +"PO-Revision-Date: 2013-10-30 22:41+0000\n" +"Last-Translator: kohpyreit <kohpyreit(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -245,8 +246,11 @@ msgid "No mount points found" msgstr "Não foram encontrados mount points" #: ../liveusb/creator.py:393 -msgid "Not enough free space on device." -msgstr "Não existe espaço livre suficiente no dispositivo." +#, python-format +msgid "" +"Not enough free space on device.\n" +"%dMB ISO + %dMB overlay > %dMB free space" +msgstr "Não existe espaço livre suficiente no dispositivo.\n%dMB ISO + %dMB overlay > %dMB free space" #: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 30 Oct '13

30 Oct '13

commit b81c2408d2fd045653a881aa7b5d087532124965 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 30 22:45:55 2013 +0000 Update translations for liveusb-creator --- pt/pt.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 62bda44..18fad0f 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -4,14 +4,15 @@ # # Translators: # SonhosDigitais <sonhosdigitais(a)gmx.com>, 2013 +# kohpyreit <kohpyreit(a)gmail.com>, 2013 # Valter Fukuoka <dotsoft(a)gmail.com>, 2008 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-09-09 09:44+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-10-30 22:41+0000\n" +"Last-Translator: kohpyreit <kohpyreit(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -249,7 +250,7 @@ msgstr "Não foram encontrados mount points" msgid "" "Not enough free space on device.\n" "%dMB ISO + %dMB overlay > %dMB free space" -msgstr "" +msgstr "Não existe espaço livre suficiente no dispositivo.\n%dMB ISO + %dMB overlay > %dMB free space" #: ../liveusb/gui.py:543 msgid "Partition is FAT16; Restricting overlay size to 2G"

1 0

[torbrowser/master] begin updating changelogs and versions for releases of 2.4.17-rc-1 and 2.3.25-14
by erinn＠torproject.org 30 Oct '13

30 Oct '13

commit 3dc0f94752e62cfaf435f877f5f100156ad0d130 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Oct 30 20:24:55 2013 -0200 begin updating changelogs and versions for releases of 2.4.17-rc-1 and 2.3.25-14 --- README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/config/Info.plist | 6 +++--- build-scripts/config/Info.plist-stable | 6 +++--- 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 | 8 ++++---- build-scripts/versions.mk | 8 ++++---- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.3 | 9 +++++++++ changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.3 | 8 ++++++++ changelog.osx-2.4 | 9 +++++++++ changelog.windows-2.3 | 9 +++++++++ changelog.windows-2.4 | 9 +++++++++ 19 files changed, 83 insertions(+), 29 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 47e5757..d602e6d 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 3.4.1 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 Usage ----- diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 2365adf..c279ed7 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 3.4.1 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 Usage ----- diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 5822f93..d7b257d 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 3.4.1 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 Usage ----- diff --git a/build-scripts/config/Info.plist b/build-scripts/config/Info.plist index 82b97f1..46d04b7 100644 --- a/build-scripts/config/Info.plist +++ b/build-scripts/config/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 2.4.16-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.17-rc-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>CFBundleIconFile</key> <string>vidalia.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.4.16-beta-1</string> + <string>2.4.17-rc-1</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 2.4.16-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.17-rc-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/build-scripts/config/Info.plist-stable b/build-scripts/config/Info.plist-stable index be38722..2920cf7 100644 --- a/build-scripts/config/Info.plist-stable +++ b/build-scripts/config/Info.plist-stable @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 2.3.25-12 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.3.25-14 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>CFBundleIconFile</key> <string>vidalia.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.3.25-12</string> + <string>2.3.25-14</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 2.3.25-12 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.3.25-14 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 4af7a84..813c228 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=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a692b33..a922130 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=13 +BUILD_NUM=14 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1429c5b..7ad744d 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ae8081..b68c3c4 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=13 +BUILD_NUM=14 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index d9bbf5c..ac78816 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,20 +1,20 @@ #!/usr/bin/make -RELEASE_VER=2.4.17-beta +RELEASE_VER=2.4.17-rc ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.6.3 +LIBPNG_VER=1.6.6 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.17-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.9esr +FIREFOX_VER=17.0.10esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 NOSCRIPT_VER=2.6.7.1 -HTTPSEVERYWHERE_VER=4.0development.12 +HTTPSEVERYWHERE_VER=3.4.2 PDFJS_VER=0.8.298 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index c2c1b69..28861e0 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -4,17 +4,17 @@ RELEASE_VER=2.3.25 ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.6.3 +LIBPNG_VER=1.6.6 QT_VER=4.8.1 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.9esr +FIREFOX_VER=17.0.10esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.7.1 -HTTPSEVERYWHERE_VER=3.4.1 +NOSCRIPT_VER=2.6.8.4 +HTTPSEVERYWHERE_VER=3.4.2 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 76bd01e..56233c4 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 41036fc..7480a4c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=13 +BUILD_NUM=14 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 1231fdf..9278246 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-14); suite=linux + + * Update Firefox to 17.0.10esr + * Update LibPNG to 1.6.6 + * Update NoScript to 2.6.8.4 + * Update HTTPS-Everywhere to 3.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:03:42 BRST 2013 + Tor Browser Bundle (2.3.25-13); suite=linux * Update Firefox to 17.0.9esr diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index d909796..0a8cd6f 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.17-rc-1); suite=linux + + * Update Firefox to 17.0.10esr + * Update LibPNG to 1.6.6 + * Update NoScript to 2.6.8.4 + * Downgrade HTTPS-Everywhere to 3.4.2 in preparation for this + becoming the stable bundle + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:09:43 BRST 2013 + Tor Browser Bundle (2.4.17-beta-2); suite=linux * Update Firefox to 17.0.9esr diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 9db8a28..9f04b53 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-14); suite=osx + + * Update Firefox to 17.0.10esr + * Update NoScript to 2.6.8.4 + * Update HTTPS-Everywhere to 3.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:03:36 BRST 2013 + Tor Browser Bundle (2.3.25-13); suite=osx * Update Firefox to 17.0.9esr diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 583f60d..5b5ab72 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-rc-1); suite=osx + + * Update Firefox to 17.0.10esr + * Update NoScript to 2.6.8.4 + * Downgrade HTTPS-Everywhere to 3.4.2 in preparation for this + becoming the stable bundle + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:09:38 BRST 2013 + Tor Browser Bundle (2.4.17-beta-2); suite=osx * Update Firefox to 17.0.9esr diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 4a77e72..b0661d3 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-14); suite=windows + + * Update Firefox to 17.0.10esr + * Update LibPNG to 1.6.6 + * Update NoScript to 2.6.8.4 + * Update HTTPS-Everywhere to 3.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:03:38 BRST 2013 + Tor Browser Bundle (2.3.25-13); suite=windows * Update Firefox to 17.0.9esr diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 0946e37..3cb2bb1 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-rc-1); suite=windows + + * Update Firefox to 17.0.10esr + * Update NoScript to 2.6.8.4 + * Downgrade HTTPS-Everywhere to 3.4.2 in preparation for this + becoming the stable bundle + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:09:41 BRST 2013 + Tor Browser Bundle (2.4.17-beta-2); suite=windows * Update Firefox to 17.0.9esr

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 30 Oct '13

30 Oct '13

commit 25a4e60f753e3bbdf4c4583188921dbf4d689bc8 Merge: a59fe69 3dc0f94 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Oct 30 20:25:33 2013 -0200 Merge branch 'maint-2.4' README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/config/Info.plist | 6 +++--- build-scripts/config/Info.plist-stable | 6 +++--- 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 | 8 ++++---- build-scripts/versions.mk | 8 ++++---- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.3 | 9 +++++++++ changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.3 | 8 ++++++++ changelog.osx-2.4 | 9 +++++++++ changelog.windows-2.3 | 9 +++++++++ changelog.windows-2.4 | 9 +++++++++ 19 files changed, 83 insertions(+), 29 deletions(-)

1 0

[torbrowser/maint-2.4] begin updating changelogs and versions for releases of 2.4.17-rc-1 and 2.3.25-14
by erinn＠torproject.org 30 Oct '13

30 Oct '13

commit 3dc0f94752e62cfaf435f877f5f100156ad0d130 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Oct 30 20:24:55 2013 -0200 begin updating changelogs and versions for releases of 2.4.17-rc-1 and 2.3.25-14 --- README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/config/Info.plist | 6 +++--- build-scripts/config/Info.plist-stable | 6 +++--- 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 | 8 ++++---- build-scripts/versions.mk | 8 ++++---- build-scripts/windows-alpha.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.3 | 9 +++++++++ changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.3 | 8 ++++++++ changelog.osx-2.4 | 9 +++++++++ changelog.windows-2.3 | 9 +++++++++ changelog.windows-2.4 | 9 +++++++++ 19 files changed, 83 insertions(+), 29 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 47e5757..d602e6d 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 3.4.1 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 Usage ----- diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 2365adf..c279ed7 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 3.4.1 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 Usage ----- diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 5822f93..d7b257d 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) -Firefox 17.0.9esr +Firefox 17.0.10esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.7.1 - |_ HTTPS-Everywhere 3.4.1 + |_ NoScript 2.6.8.4 + |_ HTTPS-Everywhere 3.4.2 Usage ----- diff --git a/build-scripts/config/Info.plist b/build-scripts/config/Info.plist index 82b97f1..46d04b7 100644 --- a/build-scripts/config/Info.plist +++ b/build-scripts/config/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 2.4.16-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.17-rc-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>CFBundleIconFile</key> <string>vidalia.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.4.16-beta-1</string> + <string>2.4.17-rc-1</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 2.4.16-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.17-rc-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/build-scripts/config/Info.plist-stable b/build-scripts/config/Info.plist-stable index be38722..2920cf7 100644 --- a/build-scripts/config/Info.plist-stable +++ b/build-scripts/config/Info.plist-stable @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 2.3.25-12 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.3.25-14 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>CFBundleIconFile</key> <string>vidalia.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.3.25-12</string> + <string>2.3.25-14</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 2.3.25-12 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.3.25-14 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 4af7a84..813c228 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=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index a692b33..a922130 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=13 +BUILD_NUM=14 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1429c5b..7ad744d 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 6ae8081..b68c3c4 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=13 +BUILD_NUM=14 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index d9bbf5c..ac78816 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,20 +1,20 @@ #!/usr/bin/make -RELEASE_VER=2.4.17-beta +RELEASE_VER=2.4.17-rc ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.6.3 +LIBPNG_VER=1.6.6 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.4.17-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=17.0.9esr +FIREFOX_VER=17.0.10esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 NOSCRIPT_VER=2.6.7.1 -HTTPSEVERYWHERE_VER=4.0development.12 +HTTPSEVERYWHERE_VER=3.4.2 PDFJS_VER=0.8.298 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index c2c1b69..28861e0 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -4,17 +4,17 @@ RELEASE_VER=2.3.25 ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.6.3 +LIBPNG_VER=1.6.6 QT_VER=4.8.1 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.9esr +FIREFOX_VER=17.0.10esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.7.1 -HTTPSEVERYWHERE_VER=3.4.1 +NOSCRIPT_VER=2.6.8.4 +HTTPSEVERYWHERE_VER=3.4.2 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 76bd01e..56233c4 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 41036fc..7480a4c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=13 +BUILD_NUM=14 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 1231fdf..9278246 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-14); suite=linux + + * Update Firefox to 17.0.10esr + * Update LibPNG to 1.6.6 + * Update NoScript to 2.6.8.4 + * Update HTTPS-Everywhere to 3.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:03:42 BRST 2013 + Tor Browser Bundle (2.3.25-13); suite=linux * Update Firefox to 17.0.9esr diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index d909796..0a8cd6f 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.17-rc-1); suite=linux + + * Update Firefox to 17.0.10esr + * Update LibPNG to 1.6.6 + * Update NoScript to 2.6.8.4 + * Downgrade HTTPS-Everywhere to 3.4.2 in preparation for this + becoming the stable bundle + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:09:43 BRST 2013 + Tor Browser Bundle (2.4.17-beta-2); suite=linux * Update Firefox to 17.0.9esr diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 9db8a28..9f04b53 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-14); suite=osx + + * Update Firefox to 17.0.10esr + * Update NoScript to 2.6.8.4 + * Update HTTPS-Everywhere to 3.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:03:36 BRST 2013 + Tor Browser Bundle (2.3.25-13); suite=osx * Update Firefox to 17.0.9esr diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 583f60d..5b5ab72 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-rc-1); suite=osx + + * Update Firefox to 17.0.10esr + * Update NoScript to 2.6.8.4 + * Downgrade HTTPS-Everywhere to 3.4.2 in preparation for this + becoming the stable bundle + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:09:38 BRST 2013 + Tor Browser Bundle (2.4.17-beta-2); suite=osx * Update Firefox to 17.0.9esr diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 4a77e72..b0661d3 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.3.25-14); suite=windows + + * Update Firefox to 17.0.10esr + * Update LibPNG to 1.6.6 + * Update NoScript to 2.6.8.4 + * Update HTTPS-Everywhere to 3.4.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:03:38 BRST 2013 + Tor Browser Bundle (2.3.25-13); suite=windows * Update Firefox to 17.0.9esr diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 0946e37..3cb2bb1 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.4.17-rc-1); suite=windows + + * Update Firefox to 17.0.10esr + * Update NoScript to 2.6.8.4 + * Downgrade HTTPS-Everywhere to 3.4.2 in preparation for this + becoming the stable bundle + + -- Erinn Clark <erinn(a)torproject.org> Wed Oct 30 20:09:41 BRST 2013 + Tor Browser Bundle (2.4.17-beta-2); suite=windows * Update Firefox to 17.0.9esr

1 0

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

30 Oct '13

commit a59fe69e17d765af1ec3d2072c25a3aa82cd709f Merge: 10f5f61 427d12c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 30 14:07:15 2013 -0700 Merge branch 'maint-2.4' .../0007-Disable-SSL-Session-ID-tracking.patch | 28 + ...observer-event-to-close-persistent-connec.patch | 40 + ...ice-and-system-specific-CSS-Media-Queries.patch | 147 + ...10-Limit-the-number-of-fonts-per-document.patch | 451 + .../0011-Rebrand-Firefox-to-TorBrowser.patch |30726 ++++++++++++++++++++ .../0012-Make-Download-manager-memory-only.patch | 57 + .../0013-Add-DDG-and-StartPage-to-Omnibox.patch | 106 + ...-nsICacheService.EvictEntries-synchronous.patch | 43 + .../firefox/0015-Prevent-WebSocket-DNS-leak.patch | 133 + ...ize-HTTP-request-order-and-pipeline-depth.patch | 791 + ...er-event-to-filter-the-Drag-Drop-url-list.patch | 74 + ...d-mozIThirdPartyUtil.getFirstPartyURI-API.patch | 311 + .../0019-Add-canvas-image-extraction-prompt.patch | 548 + ...nt-window-coordinates-for-mouse-event-scr.patch | 77 + ...se-physical-screen-info.-via-window-and-w.patch | 310 + ...not-expose-system-colors-to-CSS-or-canvas.patch | 632 + ...solate-the-Image-Cache-per-url-bar-domain.patch | 957 + .../0024-nsIHTTPChannel.redirectTo-API.patch | 474 + ...25-Isolate-DOM-storage-to-first-party-URI.patch | 794 + ...26-Remove-This-plugin-is-disabled-barrier.patch | 46 + .../0027-Use-Optimistic-Data-SOCKS-variant.patch | 82 + ...ed-Application-State-in-MacOS-via-plist-p.patch | 26 + .../0040-Disable-timestamps-in-TLS-handshake.patch | 36 + 23 files changed, 36889 insertions(+)

1 0