- tor-commits - lists.torproject.org

[gettor/master] rebuild the pot file
by arma＠torproject.org 10 Sep '11

10 Sep '11

commit e815ab6229fab86a447bcd2410f92c51592bc847 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 10 01:56:16 2011 -0400 rebuild the pot file apparently this is all that has to be done? --- i18n/templates/gettor.pot | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/templates/gettor.pot b/i18n/templates/gettor.pot index 36c17c6..0739225 100644 --- a/i18n/templates/gettor.pot +++ b/i18n/templates/gettor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-03 13:44+0200\n" +"POT-Creation-Date: 2011-09-10 01:52-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -49,7 +49,7 @@ msgstr "" #: 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: tor-assistants(a)torproject.org" +"human at this support email address: community-support(a)lists.torproject.org" msgstr "" #: lib/gettor/i18n.py:46

1 0

[gettor/master] we have a new support address
by arma＠torproject.org 10 Sep '11

10 Sep '11

commit 946984da82baca119901dad72f85bb34e4b6a3b9 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 10 01:55:40 2011 -0400 we have a new support address --- lib/gettor/i18n.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gettor/i18n.py b/lib/gettor/i18n.py index 186b518..64c9a5c 100644 --- a/lib/gettor/i18n.py +++ b/lib/gettor/i18n.py @@ -41,7 +41,7 @@ a service that doesn't use DKIM, we're sending a short explanation, and then we'll ignore this email address for the next day or so.)"""), # GETTOR_TEXT[5] _("""If you have any questions or it doesn't work, you can contact a -human at this support email address: tor-assistants(a)torproject.org"""), +human at this support email address: community-support(a)lists.torproject.org"""), # GETTOR_TEXT[6] _("""I will mail you a Tor package, if you tell me which one you want. Please select one of the following package names: @@ -128,7 +128,7 @@ _("""SUPPORT ======="""), # GETTOR_TEXT[27] _("""If you have any questions or it doesn't work, you can contact a -human at this support email address: tor-assistants(a)torproject.org"""), +human at this support email address: community-support(a)lists.torproject.org"""), # GETTOR_TEXT[28] _("""Here's your requested software as a zip file. Please unzip the package and verify the signature."""),

1 0

r25047: {website} remove the tor cloud as it's no where near ready for product (in website/trunk/projects: ar ar-sa cy da de en fa fr it pl vi)
by Andrew Lewman 10 Sep '11

10 Sep '11

Author: phobos Date: 2011-09-10 03:35:44 +0000 (Sat, 10 Sep 2011) New Revision: 25047 Removed: website/trunk/projects/en/cloud.wml Modified: website/trunk/projects/ar-sa/sidenav.wmi website/trunk/projects/ar/sidenav.wmi website/trunk/projects/cy/sidenav.wmi website/trunk/projects/da/sidenav.wmi website/trunk/projects/de/sidenav.wmi website/trunk/projects/en/projects.wml website/trunk/projects/en/sidenav.wmi website/trunk/projects/fa/sidenav.wmi website/trunk/projects/fr/sidenav.wmi website/trunk/projects/it/sidenav.wmi website/trunk/projects/pl/sidenav.wmi website/trunk/projects/vi/sidenav.wmi Log: remove the tor cloud as it's no where near ready for production. Modified: website/trunk/projects/ar/sidenav.wmi =================================================================== --- website/trunk/projects/ar/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/ar/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,9 +49,6 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', } ] }]; Modified: website/trunk/projects/ar-sa/sidenav.wmi =================================================================== --- website/trunk/projects/ar-sa/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/ar-sa/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,9 +49,6 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', } ] }]; Modified: website/trunk/projects/cy/sidenav.wmi =================================================================== --- website/trunk/projects/cy/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/cy/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,9 +49,6 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', } ] }]; Modified: website/trunk/projects/da/sidenav.wmi =================================================================== --- website/trunk/projects/da/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/da/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,9 +49,6 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', } ] }]; Modified: website/trunk/projects/de/sidenav.wmi =================================================================== --- website/trunk/projects/de/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/de/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,9 +49,6 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Messdaten Portal', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', } ] }]; Deleted: website/trunk/projects/en/cloud.wml =================================================================== --- website/trunk/projects/en/cloud.wml 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/en/cloud.wml 2011-09-10 03:35:44 UTC (rev 25047) @@ -1,29 +0,0 @@ -## translation metadata -# Revision: $Revision: 24336 $ -# Translation-Priority: 4-optional - -#include "head.wmi" TITLE="Tor Project: Tor Cloud" CHARSET="UTF-8" ANNOUNCE_RSS="yes" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page projects/projects>">Projects » </a> - <a href="<page projects/arm>">Tor Cloud » </a> - </div> - <div id="maincol"> -  - - <h2>Tor Cloud Project Page</a></h2> - <div class="underline"></div> - - <p>The Tor Cloud project provides bridge-by-default and relay-by-default images for Amazon EC2.</p> - - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> Modified: website/trunk/projects/en/projects.wml =================================================================== --- website/trunk/projects/en/projects.wml 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/en/projects.wml 2011-09-10 03:35:44 UTC (rev 25047) @@ -73,15 +73,7 @@ detailed statistics about Tor.</p> </td> </tr> -<tr> -<td> -<div class="name"><a href="https://www.torproject.org/projects/cloud.html.en">Tor Cloud</a></div> -<p>The Tor Cloud project provides bridge-by-default and relay-by-default -images for Amazon EC2.</p> -</td> -</tr> - #<td class="beige"> #<div class="name">Project Name</div> #<div class="caps">By Author</div> Modified: website/trunk/projects/en/sidenav.wmi =================================================================== --- website/trunk/projects/en/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/en/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,9 +49,6 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', } ] }]; Modified: website/trunk/projects/fa/sidenav.wmi =================================================================== --- website/trunk/projects/fa/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/fa/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,9 +49,6 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', } ] }]; Modified: website/trunk/projects/fr/sidenav.wmi =================================================================== --- website/trunk/projects/fr/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/fr/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,9 +49,6 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', } ] }]; Modified: website/trunk/projects/it/sidenav.wmi =================================================================== --- website/trunk/projects/it/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/it/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,9 +49,6 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', } ] }]; Modified: website/trunk/projects/pl/sidenav.wmi =================================================================== --- website/trunk/projects/pl/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/pl/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,10 +49,7 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Portal Pomiarów', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', - }, + } ] }]; :> Modified: website/trunk/projects/vi/sidenav.wmi =================================================================== --- website/trunk/projects/vi/sidenav.wmi 2011-09-09 19:54:52 UTC (rev 25046) +++ website/trunk/projects/vi/sidenav.wmi 2011-09-10 03:35:44 UTC (rev 25047) @@ -49,9 +49,6 @@ }, {'url' => 'https://metrics.torproject.org/', 'txt' => 'Metrics Portal', - }, - {'url' => 'projects/cloud', - 'txt' => 'Tor Cloud', } ] }];

1 0

[torbrowser/maint-2.2] update changelogs for 2.2.32-4 release
by erinn＠torproject.org 10 Sep '11

10 Sep '11

commit 4ccd562f2852f33bd533464d2f1406bc70335d73 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 00:45:02 2011 +0100 update changelogs for 2.2.32-4 release --- changelog.linux-2.2 | 15 ++++++ changelog.osx-2.2 | 13 +++++ changelog.win-2.2 | 106 ------------------------------------------- changelog.windows-2.2 | 121 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 149 insertions(+), 106 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 470125a..15edc9c 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,18 @@ +Tor Browser Bundle (2.2.32-4); suite=linux + + * Fix Makefile to allow for automatic retrieval of Qt and libpng (closes: #2255) + * Remove symlinks from tarball (closes: #2312) + * New Firefox patches + - Prevent Firefox from loading all system plugins besides Flash (closes: #2826, #3547) + - Prevent content-preferences service from writing website urls and their settings to disk (closes: #3229) + * Update Torbutton to 1.4.3 + - Don't let Torbutton inadvertently enable automatic updating in Firefox (closes: #3933) + - Fix auto-scroll on Twitter (closes: #3960) + - Allow site zoom information to be stored (closes: #3928) + - Make permissions and disk errors human-readable (closes: #3649) + + -- Erinn Clark <erinn(a)torproject.org> Sat Sep 10 00:33:48 BST 2011 + Tor Browser Bundle (2.2.32-3) alpha; suite=linux * Update Firefox to 6.0.2 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 40d67cb..72c0058 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,16 @@ +Tor Browser Bundle (2.2.32-4); suite=osx + + * New Firefox patches + - Prevent Firefox from loading all system plugins besides Flash (closes: #2826, #3547) + - Prevent content-preferences service from writing website urls and their settings to disk (closes: #3229) + * Update Torbutton to 1.4.3 + - Don't let Torbutton inadvertently enable automatic updating in Firefox (closes: #3933) + - Fix auto-scroll on Twitter (closes: #3960) + - Allow site zoom information to be stored (closes: #3928) + - Make permissions and disk errors human-readable (closes: #3649) + + -- Erinn Clark <erinn(a)torproject.org> Fri Sep 9 23:00:06 BST 2011 + Tor Browser Bundle (2.2.32-3) alpha; suite=osx * Update Firefox to 6.0.2 diff --git a/changelog.win-2.2 b/changelog.win-2.2 deleted file mode 100644 index 113f416..0000000 --- a/changelog.win-2.2 +++ /dev/null @@ -1,106 +0,0 @@ -Tor Browser Bundle (2.2.32-3) alpha; suite=windows - - * Update Firefox to 6.0.2 - * New Firefox patches - - Improve cache APIs to enable better isolation (closes: #3666) - - Provide auth headers to on-modify-request (closes: #3907) - - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) - - Enable HTTP pipelining in TBB prefs.js too (closes: #3913) - * Update Torbutton to 1.4.2 - * Update NoScript to 2.1.2.7 - * Add missing C runtime libraries so WinXP users can use TBB again. Fix found by velope. - - -- Erinn Clark <erinn(a)torproject.org> Mon Sep 5 00:10:55 BST 2011 - -Tor Browser Bundle (2.2.32-2) alpha; suite=windows - - * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely - - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603… - For the full saga, read: - - http://blog.mozilla.com/security/2011/08/29/fraudulent-google-com-certifica… - - http://googleonlinesecurity.blogspot.com/2011/08/update-on-attempted-man-in… - * Update Libevent to 2.0.14-stable - * Update torbrowser.version string in prefs.js to have more information (see #3504) - * Enable internationalized bundles by adding and changing the - general.useragent.locale pref in prefs.js - - -- Erinn Clark <erinn(a)torproject.org> Wed Aug 31 17:43:09 BST 2011 - -Tor Browser Bundle (2.2.32-1) alpha; suite=windows - - * Update Tor to 0.2.2.32 - * Update Vidalia to 0.2.14 - * Update Torbutton to 1.4.1 - * Enable automatic port choosing (closes: #2264) - - -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 - -Tor Browser Bundle (2.2.31-1) alpha; suite=windows - - * Update Tor to 0.2.2.31-rc - * Update Firefox to 6.0 - * Update Libevent to 2.0.13-stable - * Update NoScript to 2.1.2.6 - * Update HTTPS Everywhere to 1.0.0development.5 - * Remove BetterPrivacy until we can figure out how to make it safe in all - bundles (see #3597) - - -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 - -Tor Browser Bundle (2.2.30-2) alpha; suite=windows - - * Update Firefox to 5.0.1 - - -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 - -Tor Browser Bundle (2.2.30-1) alpha; suite=windows - - * Update Tor to 0.2.2.30-rc - * Update Firefox to 5.0 - * Update Torbutton to 1.4.0 - * Update HTTPS Everywhere to 1.0.0development.4 - * Update NoScript to 2.1.1.2 - - -- Erinn Clark <erinn(a)torproject.org> Tue Jul 12 19:26:17 ART 2011 - -Tor Browser Bundle (2.2.29-1) alpha; suite=windows - - * Update Tor to 0.2.2.29-beta - * Update Libevent to 2.0.12-stable - * Update HTTPS Everywhere to 0.9.9.development.6 - * Update NoScript to 2.1.1.1 - * Update BetterPrivacy to 1.51 - - -- Erinn Clark <erinn(a)torproject.org> Tue Jun 21 18:00:51 ART 2011 - -Tor Browser Bundle (2.2.27-1) alpha; suite=windows - - * Update Tor to 0.2.2.27-beta - * Update HTTPS Everywhere to 0.9.9.development.5 - * Update NoScript to 2.1.0.5 - - -- Erinn Clark <erinn(a)torproject.org> Fri May 20 22:11:00 ART 2011 - -Tor Browser Bundle (2.2.25-1) alpha; suite=windows - - * Update Tor to 0.2.2.25-alpha - * Update Firefox to 4.0.1 - * Update Torbutton to 1.3.3-alpha - * Update BetterPrivacy to 1.50 - * Update NoScript to 2.1.0.3 - - -- Erinn Clark <erinn(a)torproject.org> Tue May 3 11:49:53 IDT 2011 - -Tor Browser Bundle (2.2.24-1) alpha; suite=windows - - * Create new bundle for Firefox 4 - * Update Tor to 0.2.2.24-alpha - * Update Torbutton to 1.3.2-alpha - * Update OpenSSL to 1.0.0d - * Update Libevent to 2.0.10-stable - * Update HTTPS-Everywhere to 0.9.9.development.4 - * Add NoScript 2.0.9.9 - * Add BetterPrivacy 1.49 - * The Opa Heinz release - - -- Erinn Clark <erinn(a)torproject.org> Sun Apr 24 23:56:34 IDT 2011 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 new file mode 100644 index 0000000..b09bbf3 --- /dev/null +++ b/changelog.windows-2.2 @@ -0,0 +1,121 @@ +Tor Browser Bundle (2.2.32-4); suite=windows + + * Disable automatic port selection to accommodate Windows users with + firewalls that don't allow connections or traffic on high ports (closes: #3952, #3945) + * New Firefox patches + - Prevent Firefox from loading all system plugins besides Flash (closes: #2826, #3547) + - Prevent content-preferences service from writing website urls and their settings to disk (closes: #3229) + * Update Torbutton to 1.4.3 + - Don't let Torbutton inadvertently enable automatic updating in Firefox (closes: #3933) + - Fix auto-scroll on Twitter (closes: #3960) + - Allow site zoom information to be stored (closes: #3928) + - Make permissions and disk errors human-readable (closes: #3649) + + -- Erinn Clark <erinn(a)torproject.org> Sat Sep 10 00:27:42 BST 2011 + +Tor Browser Bundle (2.2.32-3) alpha; suite=windows + + * Update Firefox to 6.0.2 + * New Firefox patches + - Improve cache APIs to enable better isolation (closes: #3666) + - Provide auth headers to on-modify-request (closes: #3907) + - Enable HTTP Pipelining as an experimental fingerprinting defense (closes: #3914) + - Enable HTTP pipelining in TBB prefs.js too (closes: #3913) + * Update Torbutton to 1.4.2 + * Update NoScript to 2.1.2.7 + * Add missing C runtime libraries so WinXP users can use TBB again. Fix found by velope. + + -- Erinn Clark <erinn(a)torproject.org> Mon Sep 5 00:10:55 BST 2011 + +Tor Browser Bundle (2.2.32-2) alpha; suite=windows + + * Update Firefox to 6.0.1, with an additional patch to exclude DigiNotar completely + - https://gitweb.torproject.org/torbrowser.git/commit/0be3b043afa0e54d207f603… + For the full saga, read: + - http://blog.mozilla.com/security/2011/08/29/fraudulent-google-com-certifica… + - http://googleonlinesecurity.blogspot.com/2011/08/update-on-attempted-man-in… + * Update Libevent to 2.0.14-stable + * Update torbrowser.version string in prefs.js to have more information (see #3504) + * Enable internationalized bundles by adding and changing the + general.useragent.locale pref in prefs.js + + -- Erinn Clark <erinn(a)torproject.org> Wed Aug 31 17:43:09 BST 2011 + +Tor Browser Bundle (2.2.32-1) alpha; suite=windows + + * Update Tor to 0.2.2.32 + * Update Vidalia to 0.2.14 + * Update Torbutton to 1.4.1 + * Enable automatic port choosing (closes: #2264) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 + +Tor Browser Bundle (2.2.31-1) alpha; suite=windows + + * Update Tor to 0.2.2.31-rc + * Update Firefox to 6.0 + * Update Libevent to 2.0.13-stable + * Update NoScript to 2.1.2.6 + * Update HTTPS Everywhere to 1.0.0development.5 + * Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + + -- Erinn Clark <erinn(a)torproject.org> Sat Aug 20 20:40:52 CEST 2011 + +Tor Browser Bundle (2.2.30-2) alpha; suite=windows + + * Update Firefox to 5.0.1 + + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 13 09:07:41 ART 2011 + +Tor Browser Bundle (2.2.30-1) alpha; suite=windows + + * Update Tor to 0.2.2.30-rc + * Update Firefox to 5.0 + * Update Torbutton to 1.4.0 + * Update HTTPS Everywhere to 1.0.0development.4 + * Update NoScript to 2.1.1.2 + + -- Erinn Clark <erinn(a)torproject.org> Tue Jul 12 19:26:17 ART 2011 + +Tor Browser Bundle (2.2.29-1) alpha; suite=windows + + * Update Tor to 0.2.2.29-beta + * Update Libevent to 2.0.12-stable + * Update HTTPS Everywhere to 0.9.9.development.6 + * Update NoScript to 2.1.1.1 + * Update BetterPrivacy to 1.51 + + -- Erinn Clark <erinn(a)torproject.org> Tue Jun 21 18:00:51 ART 2011 + +Tor Browser Bundle (2.2.27-1) alpha; suite=windows + + * Update Tor to 0.2.2.27-beta + * Update HTTPS Everywhere to 0.9.9.development.5 + * Update NoScript to 2.1.0.5 + + -- Erinn Clark <erinn(a)torproject.org> Fri May 20 22:11:00 ART 2011 + +Tor Browser Bundle (2.2.25-1) alpha; suite=windows + + * Update Tor to 0.2.2.25-alpha + * Update Firefox to 4.0.1 + * Update Torbutton to 1.3.3-alpha + * Update BetterPrivacy to 1.50 + * Update NoScript to 2.1.0.3 + + -- Erinn Clark <erinn(a)torproject.org> Tue May 3 11:49:53 IDT 2011 + +Tor Browser Bundle (2.2.24-1) alpha; suite=windows + + * Create new bundle for Firefox 4 + * Update Tor to 0.2.2.24-alpha + * Update Torbutton to 1.3.2-alpha + * Update OpenSSL to 1.0.0d + * Update Libevent to 2.0.10-stable + * Update HTTPS-Everywhere to 0.9.9.development.4 + * Add NoScript 2.0.9.9 + * Add BetterPrivacy 1.49 + * The Opa Heinz release + + -- Erinn Clark <erinn(a)torproject.org> Sun Apr 24 23:56:34 IDT 2011

1 0

[torbrowser/maint-2.2] bump build versions to 4 and torbutton to 1.4.3
by erinn＠torproject.org 10 Sep '11

10 Sep '11

commit 69e5c54bc487f16fcfc2625769bc0fd4b185f654 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 02:27:03 2011 +0100 bump build versions to 4 and torbutton to 1.4.3 --- README.LINUX-2.2 | 2 +- README.OSX-2.2 | 2 +- README.WIN-2.2 | 2 +- build-scripts/linux.mk | 5 ++++- build-scripts/osx.mk | 7 +++++-- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 5 ++++- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index b1f441c..2f23ecf 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 6.0.2 - \_ Torbutton 1.4.2 + \_ Torbutton 1.4.3 |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 5358d96..0f63125 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 6.0.2 - \_ Torbutton 1.4.2 + \_ Torbutton 1.4.3 |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index e054a10..90f8fc7 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -8,7 +8,7 @@ Vidalia 0.2.14 (with Qt 4.6.2) Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) FirefoxPortable 6.0.2 \_ Firefox (Aurora) 6.0.2 - \_ Torbutton 1.4.2 + \_ Torbutton 1.4.3 |_ NoScript 2.1.2.7 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 47fd74b..089218f 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Linux ## Location of directory for source unpacking @@ -489,6 +489,9 @@ update-extension-pref: sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Data/profile/prefs.js sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/App/Firefox/defaults/profile/prefs.js +print-version: + @echo $(RELEASE_VER)-$(BUILD_NUM) + write-tbb-version: printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Data/profile/prefs.js diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 7d03546..d19576e 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=MacOS ## Location of directory for source unpacking @@ -396,7 +396,7 @@ ifneq ($(LANGCODE), en-US) (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) endif -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf +install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/ cp langpack_$(LANGCODE).xpi $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi @@ -443,6 +443,9 @@ update-extension-pref: sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js sed -i -e "s/SHPONKA/$(LANGCODE)/g" $(BUNDLE)/Contents/MacOS/Firefox.app/Contents/MacOS/Data/profile/prefs.js +print-version: + @echo $(RELEASE_VER)-$(BUILD_NUM) + write-tbb-version: printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 65d9abc..44a79a4 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -13,7 +13,7 @@ PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 TOR_VER=0.2.2.32 -TORBUTTON_VER=1.4.2 +TORBUTTON_VER=1.4.3 VIDALIA_VER=0.2.14 ZLIB_VER=1.4.0 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index de36634..8014ac4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=3 +BUILD_NUM=4 PLATFORM=Windows ## Location of required libraries @@ -469,6 +469,9 @@ patch-firefox-language: apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) +print-version: + @echo $(RELEASE_VER)-$(BUILD_NUM) + write-tbb-version: printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)-$(ARCH_TYPE)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js

1 0

[torbrowser/maint-2.2] don't use fix-install-rdf target right now
by erinn＠torproject.org 10 Sep '11

10 Sep '11

commit a2265c380570f97445adc7fa4ad7100c793af898 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 02:28:14 2011 +0100 don't use fix-install-rdf target right now --- build-scripts/linux.mk | 2 +- build-scripts/windows.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 089218f..3d6c6bf 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -453,7 +453,7 @@ ifneq ($(LANGCODE), en-US) (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) endif -install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf +install-lang-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ifneq ($(LANGCODE), en-US) mkdir -p $(BUNDLE)/Data/profile/extensions cp langpack_$(LANGCODE).xpi $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org.xpi diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 8014ac4..7d257d4 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -410,7 +410,7 @@ ifneq ($(LANGCODE), en-US) (cd xx && unzip ../langpack_$(LANGCODE).xpi && sed -i -e "s/em:maxVersion>6.0.1/em:maxVersion>6.0.*/" install.rdf && zip -r ../langpack_$(LANGCODE).xpi .) endif -install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) fix-install-rdf +install-extensions: $(filter-out langpack_en-US.xpi,langpack_$(LANGCODE).xpi) ## Make a dummy profile to stop Firefox creating some large files cp -r $(BUNDLE)/FirefoxPortable/App/DefaultData $(DUMMYPROFILE) mkdir -p $(BUNDLE)/FirefoxPortable/Data/profile/extensions

1 0

[torbrowser/maint-2.2] update libpng and qt targets for linux (closes: #2255)
by erinn＠torproject.org 10 Sep '11

10 Sep '11

commit c6a2072983b969fed1e628f0632c0908f1aa752b Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 02:28:34 2011 +0100 update libpng and qt targets for linux (closes: #2255) --- build-scripts/versions.mk | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 44a79a4..1e36e0f 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -23,6 +23,7 @@ FF_VENDOR_ID:=\{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} ## File names for the source packages ZLIB_PACKAGE=zlib-$(ZLIB_VER).tar.gz OPENSSL_PACKAGE=openssl-$(OPENSSL_VER).tar.gz +LIBPNG_PACKAGE=libpng-$(LIBPNG_VER).tar.bz2 QT_PACKAGE=qt-everywhere-opensource-src-$(QT_VER).tar.gz VIDALIA_PACKAGE=vidalia-$(VIDALIA_VER).tar.gz LIBEVENT_PACKAGE=libevent-$(LIBEVENT_VER).tar.gz @@ -33,6 +34,7 @@ FIREFOX_PACKAGE=firefox-$(FIREFOX_VER).source.tar.bz2 ## Location of files for download ZLIB_URL=http://www.zlib.net/$(ZLIB_PACKAGE) OPENSSL_URL=http://www.openssl.org/source/$(OPENSSL_PACKAGE) +LIBPNG_URL=ftp://ftp.simplesystems.org/pub/libpng/png/src/$(LIBPNG_PACKAGE) QT_URL=ftp://ftp.qt.nokia.com/qt/source/$(QT_PACKAGE) VIDALIA_URL=http://www.torproject.org/dist/vidalia/$(VIDALIA_PACKAGE) LIBEVENT_URL=https://github.com/downloads/libevent/libevent/$(LIBEVENT_PACK… @@ -40,12 +42,15 @@ TOR_URL=http://www.torproject.org/dist/$(TOR_PACKAGE) PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/$(PIDGIN_PAC… FIREFOX_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(… -fetch-source: fetch-zlib fetch-openssl fetch-vidalia fetch-libevent fetch-tor fetch-firefox +fetch-source: fetch-zlib fetch-openssl fetch-libpng fetch-qt fetch-vidalia fetch-libevent fetch-tor fetch-firefox -mkdir $(FETCH_DIR) fetch-zlib: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(ZLIB_URL) +fetch-libpng: + $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(LIBPNG_URL) + fetch-qt: $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(QT_URL) @@ -65,12 +70,16 @@ fetch-firefox: -rm -rf $(FETCH_DIR)/mozilla-release $(WGET) --no-check-certificate --directory-prefix=$(FETCH_DIR) $(FIREFOX_URL) -unpack-source: unpack-zlib unpack-openssl unpack-vidalia unpack-libevent unpack-tor unpack-firefox +unpack-source: unpack-zlib unpack-openssl unpack-libpng unpack-qt unpack-vidalia unpack-libevent unpack-tor unpack-firefox unpack-zlib: -rm -rf $(FETCH_DIR)/zlib-$(ZLIB_VER) cd $(FETCH_DIR) && tar -xvzf $(ZLIB_PACKAGE) +unpack-libpng: + -rm -rf $(FETCH_DIR)/libpng-$(LIBPNG_VER) + cd $(FETCH_DIR) && tar -xvjf $(LIBPNG_PACKAGE) + unpack-openssl: -rm -rf $(FETCH_DIR)/openssl-$(OPENSSL_VER) cd $(FETCH_DIR) && tar -xvzf $(OPENSSL_PACKAGE)

1 0

[torbrowser/maint-2.2] use git archive so I can make signed source tarballs from signed tags
by erinn＠torproject.org 10 Sep '11

10 Sep '11

commit 550e9e8f7413ccfea8fb461b793d26c17a27efa2 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat Sep 10 02:29:47 2011 +0100 use git archive so I can make signed source tarballs from signed tags --- build-scripts/windows.mk | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 7d257d4..09299a2 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -481,9 +481,5 @@ SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp SRCDESTPATH=$(SRCDEST)/$(SRCNAME) srcdist: - rm -fr $(SRCDESTPATH) - git clone -b maint-2.2 git://git.torproject.org/torbrowser.git \ - $(SRCDESTPATH) - cd $(SRCDEST); tar --exclude src/archived-patches \ - --exclude src/processtest --exclude .git -czvf $(SRCNAME)-src.tar.gz $(SRCNAME) + git archive --format=tar --prefix=tor-browser-$(VERSION)-src/ torbrowser-$(VERSION) | gzip -9 > $(PWD)/tor-browser-$(VERSION)-src.tar.gz

1 0

[torbutton/master] Update changelog + bump versions to 1.4.3.
by mikeperry＠torproject.org 10 Sep '11

10 Sep '11

commit e0b34f4786928829dfd8d2463b7b05aab313601d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 9 15:40:13 2011 -0700 Update changelog + bump versions to 1.4.3. --- README.RELEASE | 2 +- src/CHANGELOG | 7 +++++++ src/install.rdf | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.RELEASE b/README.RELEASE index 0d68a55..3dfaaec 100644 --- a/README.RELEASE +++ b/README.RELEASE @@ -5,7 +5,7 @@ #. Decide the version number. - export VERSION="1.4.2" + export VERSION="1.4.3" vim ./src/install.rdf # edit <em:version> tag to reflect version #. Test upgrades of candidate XPI in latest Firefox and TBB product matrix diff --git a/src/CHANGELOG b/src/CHANGELOG index 51bef80..1c760bf 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.4.3 + 9 Sep 2011 + * bug 3933: Don't touch app.update.auto in TBB + * bug 3960: Don't disable zoom.siteSpecific on TBB + * bug 3928: Fix auto-scroll on twitter + * bug 3649: Make permissions and disk errors human-readable + 1.4.2 3 Sep 2011 * bug 3879: Fix broken framed sites (yopmail, gmane, gmaps, etc) diff --git a/src/install.rdf b/src/install.rdf index af40be4..d6fadd6 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry & Kory Kirk</em:creator> <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id> - <em:version>1.4.2</em:version> + <em:version>1.4.3</em:version> <em:homepageURL>https://www.torproject.org/torbutton/</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug #3649: Make permissions and disk errors human-readable.
by mikeperry＠torproject.org 10 Sep '11

10 Sep '11

commit f0f34bfdff94a64adc348a1b546e985be489107c Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 9 15:04:31 2011 -0700 Bug #3649: Make permissions and disk errors human-readable. Never write "this should never happen" in a comment. Doing so is apparently a an ancient voodoo curse that ensures that it does. --- src/chrome/content/torbutton.js | 41 ++++++++++++++++++++++++---- src/chrome/locale/en/torbutton.properties | 3 ++ 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3998770..2e52830 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -402,10 +402,24 @@ function torbutton_set_status() { try { torbutton_update_status(true, false); } catch(e) { - // This should never happen.. - // FIXME: Do we need to translate it? I'm guessing not. - window.alert("Torbutton: Please file bug report! Error applying Tor settings: "+e); torbutton_log(5,'Error applying tor settings: '+e); + var wm = Cc["@mozilla.org/appshell/window-mediator;1"] + .getService(Components.interfaces.nsIWindowMediator); + var chrome = wm.getMostRecentWindow("navigator:browser"); + var o_stringbundle = torbutton_get_stringbundle(); + var warning1 = o_stringbundle.GetStringFromName("torbutton.popup.pref_error"); + + if (e.result == 0x80520015 || e.result == 0x80520013) { // NS_ERROR_FILE_ACCESS_DENIED/NS_ERROR_FILE_READ_ONLY + var warning2 = o_stringbundle.GetStringFromName("torbutton.popup.permission_denied"); + chrome.alert(warning1+"\n\n"+warning2); + } else if (e.result == 0x80520010) { // NS_ERROR_FILE_NO_DEVICE_SPACE + var o_stringbundle = torbutton_get_stringbundle(); + var warning2 = o_stringbundle.GetStringFromName("torbutton.popup.device_full"); + chrome.alert(warning1+"\n\n"+warning2); + } else { + // This should never happen.. + chrome.alert(warning1+"\n\n"+e); + } // Setting these prefs should avoid ininite recursion // because torbutton_update_status should return immediately // on the next call. @@ -419,10 +433,25 @@ function torbutton_set_status() { try { torbutton_update_status(false, false); } catch(e) { - // This should never happen.. - // FIXME: Do we need to translate it? I'm guessing not. - window.alert("Torbutton: Please file bug report! Error applying Non-Tor settings: "+e); torbutton_log(5,'Error applying nontor settings: '+e); + + var wm = Cc["@mozilla.org/appshell/window-mediator;1"] + .getService(Components.interfaces.nsIWindowMediator); + var chrome = wm.getMostRecentWindow("navigator:browser"); + var o_stringbundle = torbutton_get_stringbundle(); + var warning1 = o_stringbundle.GetStringFromName("torbutton.popup.pref_error"); + + if (e.result == 0x80520015 || e.result == 0x80520013) { // NS_ERROR_FILE_ACCESS_DENIED/NS_ERROR_FILE_READ_ONLY + var warning2 = o_stringbundle.GetStringFromName("torbutton.popup.permission_denied"); + chrome.alert(warning1+"\n\n"+warning2); + } else if (e.result == 0x80520010) { // NS_ERROR_FILE_NO_DEVICE_SPACE + var o_stringbundle = torbutton_get_stringbundle(); + var warning2 = o_stringbundle.GetStringFromName("torbutton.popup.device_full"); + chrome.alert(warning1+"\n\n"+warning2); + } else { + // This should never happen.. + chrome.alert(warning1+"\n\n"+e); + } // Setting these prefs should avoid infinite recursion // because torbutton_update_status should return immediately // on the next call. diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index c1aa1b6..773e8db 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -37,3 +37,6 @@ torbutton.popup.no_redirect = Don't Redirect torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor(a)torproject.org or by downloading it at the following URL: +torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. +torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. +torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.

1 0