[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-04-21 Thread translation 
commit a406bfd547c7b028865110ece1c595cde338241b
Author: Translation commit bot translat...@torproject.org
Date:   Tue Apr 21 17:45:03 2015 +

Update translations for bridgedb
---
 ro/LC_MESSAGES/bridgedb.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po
index b5a2d9c..057bf01 100644
--- a/ro/LC_MESSAGES/bridgedb.po
+++ b/ro/LC_MESSAGES/bridgedb.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Adda.17 adrianatri...@gmail.com, 2013
+# Ana ana_maria...@yahoo.com, 2015
 # axel_89 axel_...@yahoo.com, 2015
 # Isus Satanescu i...@openmailbox.org, 2014
 # laura berindei lauraagavril...@yahoo.com, 2014
@@ -12,8 +13,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-04-19 08:23+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2015-04-21 17:33+\n
+Last-Translator: Ana ana_maria...@yahoo.com\n
 Language-Team: Romanian 
(http://www.transifex.com/projects/p/torproject/language/ro/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -43,7 +44,7 @@ msgstr [ Acesta este un mesaj automat ; va rugam nu 
răspundeţi ]
 
 #: lib/bridgedb/strings.py:20
 msgid Here are your bridges:
-msgstr Acestea sînt punțile pentru dvs:
+msgstr Acestea sunt punțile pentru dvs:
 
 #: lib/bridgedb/strings.py:22
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Update logo.patch to remove extra spacing

2015-04-21 Thread sukhbir 
commit 1a4200cbf6b0c5e9d8bf05677a4349b06ecc84b5
Author: Sukhbir Singh sukh...@torproject.org
Date:   Tue Apr 21 14:37:13 2015 -0400

Update logo.patch to remove extra spacing
---
 projects/tor-launcher/logo.patch |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/projects/tor-launcher/logo.patch b/projects/tor-launcher/logo.patch
index 0e5daa1..a67d1ab 100644
--- a/projects/tor-launcher/logo.patch
+++ b/projects/tor-launcher/logo.patch
@@ -1,13 +1,14 @@
 diff --git a/src/chrome/skin/network-settings.css 
b/src/chrome/skin/network-settings.css
-index 331ae42..3331854 100644
+index 646baa6..e8f236f 100644
 --- a/src/chrome/skin/network-settings.css
 +++ b/src/chrome/skin/network-settings.css
-@@ -90,7 +90,7 @@ button.firstAnswer {
+@@ -90,8 +90,7 @@ button.firstAnswer {
  .tbb-logo {
list-style-image: url(chrome://torlauncher/skin/tbb-logo.png);
width: 115px;
 -  height: 80px;
+-  margin-right: 20px;
 +  height: 94px;
-   margin-right: 20px;
  }
  
+ wizard[tor_hide_browser_logo=true] .tbb-logo,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Merge branch 'bug_15689_v3'

2015-04-21 Thread gk 
commit b1a683d04ffd9054e2807013c5bc35fed8604b20
Merge: a73cdf8 713cf60
Author: Georg Koppen g...@torproject.org
Date:   Tue Apr 21 08:33:10 2015 +

Merge branch 'bug_15689_v3'

 gitian/descriptors/linux/gitian-bundle.yml   |   15 ---
 gitian/descriptors/mac/gitian-bundle.yml |   15 ---
 gitian/descriptors/windows/gitian-bundle.yml |   15 ---
 gitian/fetch-inputs.sh   |4 +---
 gitian/gpg/https-everywhere.gpg  |  Bin 83382 - 112546 bytes
 gitian/verify-tags.sh|4 ++--
 gitian/versions  |6 +-
 gitian/versions.alpha|6 +-
 gitian/versions.beta |6 +-
 gitian/versions.nightly  |4 
 10 files changed, 30 insertions(+), 45 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Bug 15689: Switch back to HTTPS-E git repository

2015-04-21 Thread gk 
commit c04aaaf3d147ae9f46e046e47579c9c3979f3c45
Author: Georg Koppen g...@torproject.org
Date:   Fri Apr 17 05:15:32 2015 +

Bug 15689: Switch back to HTTPS-E git repository

Now that bug 11630 got fixed for HTTPS-Everywhere 5.0 and the latter is
shipped in Tor Browser stable we can switch back to using the
HTTPS-Everywhere git repository and its signed tags.
---
 gitian/descriptors/linux/gitian-bundle.yml   |   15 ---
 gitian/descriptors/mac/gitian-bundle.yml |   15 ---
 gitian/descriptors/windows/gitian-bundle.yml |   15 ---
 gitian/fetch-inputs.sh   |4 +---
 gitian/verify-tags.sh|4 ++--
 gitian/versions  |6 +-
 gitian/versions.alpha|6 +-
 gitian/versions.beta |6 +-
 gitian/versions.nightly  |4 
 9 files changed, 30 insertions(+), 45 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml 
b/gitian/descriptors/linux/gitian-bundle.yml
index b6a4a26..f5ad824 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -9,8 +9,10 @@ packages:
 - faketime
 - unzip
 - zip
-# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5.
+# These three packages are needed for assembling the HTTPS-Everywhere rules
+# since 5.0.
 - libxslt1.1
+- libxml2-utils
 - sqlite3
 reference_datetime: 2000-01-01 00:00:00
 remotes:
@@ -41,7 +43,6 @@ files:
 - linux-skeleton.zip
 - linux-langpacks.zip
 - noscr...@noscript.net.xpi
-- https-everywh...@eff.org.xpi
 - dzip.sh
 - dtar.sh
 - bare-version
@@ -95,13 +96,13 @@ script: |
   ~/build/dzip.sh 
../../../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/torbut...@torproject.org.xpi
 .
   cd ../../../
   #
-  #cd https-everywhere
+  cd https-everywhere
   # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
-  #rm -f .git/refs/heads/master
-  #./makexpi.sh
-  #cp pkg/*.xpi 
../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
-  #cd ..
+  rm -f .git/refs/heads/master
+  ./makexpi.sh
+  cp pkg/*.xpi 
../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
+  cd ..
   #
   cp *.xpi 
tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/
   cd tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions
diff --git a/gitian/descriptors/mac/gitian-bundle.yml 
b/gitian/descriptors/mac/gitian-bundle.yml
index 1cf75e9..7945f5e 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -8,8 +8,10 @@ packages:
 - faketime
 - unzip
 - zip
-# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5.
+# These three packages are needed for assembling the HTTPS-Everywhere rules
+# since 5.0.
 - python-lxml
+- libxml2-utils
 - sqlite3
 # Needed for the .dmgs
 - genisoimage
@@ -42,7 +44,6 @@ files:
 - dmg-desktop.tar.xz
 - mac-langpacks.zip
 - noscr...@noscript.net.xpi
-- https-everywh...@eff.org.xpi
 - dzip.sh
 - ddmg.sh
 - background-plist.py
@@ -103,13 +104,13 @@ script: |
   ~/build/dzip.sh 
../../../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/torbut...@torproject.org.xpi
 .
   cd ../../../
   #
-  # cd https-everywhere
+  cd https-everywhere
   # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
-  # rm -f .git/refs/heads/master
-  # ./makexpi.sh
-  # cp pkg/*.xpi 
../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
-  # cd ..
+  rm -f .git/refs/heads/master
+  ./makexpi.sh
+  cp pkg/*.xpi 
../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
+  cd ..
   #
   cp *.xpi 
./$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/
   cd $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/
diff --git a/gitian/descriptors/windows/gitian-bundle.yml 
b/gitian/descriptors/windows/gitian-bundle.yml
index 76f5c67..d089e0d 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -9,8 +9,10 @@ packages:
 - unzip
 - zip
 - nsis
-# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5.
+# These three packages are needed for assembling the HTTPS-Everywhere rules
+# since 5.0.
 - python-lxml
+- libxml2-utils
 - sqlite3
 reference_datetime: 2000-01-01 00:00:00
 remotes:
@@ -35,7 +37,6 @@ files:
 - windows-skeleton.zip
 - win32-langpacks.zip
 - noscr...@noscript.net.xpi
-- https-everywh...@eff.org.xpi
 - dzip.sh
 - bare-version
 - bundle.inputs
@@

[tor-commits] [tor-browser-bundle/master] Adding jsha's key to the HTTPS-E signing key

2015-04-21 Thread gk 
commit 713cf60037bf2582d4f290e78780ee00bf461aa8
Author: Georg Koppen g...@torproject.org
Date:   Thu Apr 16 11:01:09 2015 +

Adding jsha's key to the HTTPS-E signing key
---
 gitian/gpg/https-everywhere.gpg |  Bin 83382 - 112546 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg
index ced373f..96a2f45 100644
Binary files a/gitian/gpg/https-everywhere.gpg and 
b/gitian/gpg/https-everywhere.gpg differ



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Add patch for setting Tor Messenger as the brand name

2015-04-21 Thread sukhbir 
commit f70ecf4ba62cbbb5c31feba50c7225dce54dd650
Author: Sukhbir Singh sukh...@torproject.org
Date:   Tue Apr 21 11:28:11 2015 -0400

Add patch for setting Tor Messenger as the brand name
---
 projects/instantbird/config |1 +
 projects/instantbird/name.patch |   46 +++
 2 files changed, 47 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index d8443db..0edbf91 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -68,6 +68,7 @@ input_files:
   - filename: theme-extension-update.patch
   - filename: installer.patch
   - filename: cert_override.txt
+  - filename: branding/name.patch
   - filename: fix-mingw-build.patch
 enable: '[% c(var/windows) %]'
   - filename: 'mozconfig-[% c(var/osname) %]'
diff --git a/projects/instantbird/name.patch b/projects/instantbird/name.patch
new file mode 100644
index 000..378c6db
--- /dev/null
+++ b/projects/instantbird/name.patch
@@ -0,0 +1,46 @@
+diff --git a/im/branding/messenger/branding.nsi 
b/im/branding/messenger/branding.nsi
+index e5b5348..276722b 100755
+--- a/im/branding/messenger/branding.nsi
 b/im/branding/messenger/branding.nsi
+@@ -6,8 +6,8 @@
+ 
+ # BrandFullNameInternal is used for some registry and file system values that
+ # should not contain release that may be in the BrandFullName (e.g. Beta 1, 
etc.)
+-!define BrandFullNameInternal Instantbird
+-!define CompanyName   Instantbird
+-!define URLInfoAbout  http://www.instantbird.com/;
+-!define URLUpdateInfo http://www.instantbird.com/;
++!define BrandFullNameInternal Tor Messenger
++!define CompanyName   Tor Messenger
++!define URLInfoAbout  https://www.torproject.org;
++!define URLUpdateInfo https://www.torproject.org;
+ 
+diff --git a/im/branding/messenger/locales/en-US/brand.dtd 
b/im/branding/messenger/locales/en-US/brand.dtd
+index c569ebb..2d6a5d8 100644
+--- a/im/branding/messenger/locales/en-US/brand.dtd
 b/im/branding/messenger/locales/en-US/brand.dtd
+@@ -4,7 +4,7 @@
+ 
+ !-- nightly branding --
+ 
+-!ENTITY  brandShortNameInstantbird
+-!ENTITY  brandFullName Instantbird - Nightly
++!ENTITY  brandShortNameTor Messenger
++!ENTITY  brandFullName Tor Messenger - Alpha
+ !ENTITY  brandMotto'Cause geeks can also do magic!
+-!ENTITY  vendorShortName   Instantbird
++!ENTITY  vendorShortName   Tor Messenger
+diff --git a/im/branding/messenger/locales/en-US/brand.properties 
b/im/branding/messenger/locales/en-US/brand.properties
+index f949ced..93528a3 100644
+--- a/im/branding/messenger/locales/en-US/brand.properties
 b/im/branding/messenger/locales/en-US/brand.properties
+@@ -2,6 +2,6 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-brandShortName=Instantbird
+-brandFullName=Instantbird - Nightly
+-vendorShortName=Instantbird
++brandShortName=Tor Messenger
++brandFullName=Tor Messenger - Alpha
++vendorShortName=Tor Messenger

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Move name.patch to branding directory

2015-04-21 Thread sukhbir 
commit 7fc0b833eca44716d9310bc27aa7994d0174a6f6
Author: Sukhbir Singh sukh...@torproject.org
Date:   Tue Apr 21 11:49:05 2015 -0400

Move name.patch to branding directory
---
 projects/instantbird/branding/name.patch |   46 ++
 projects/instantbird/name.patch  |   46 --
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/projects/instantbird/branding/name.patch 
b/projects/instantbird/branding/name.patch
new file mode 100644
index 000..378c6db
--- /dev/null
+++ b/projects/instantbird/branding/name.patch
@@ -0,0 +1,46 @@
+diff --git a/im/branding/messenger/branding.nsi 
b/im/branding/messenger/branding.nsi
+index e5b5348..276722b 100755
+--- a/im/branding/messenger/branding.nsi
 b/im/branding/messenger/branding.nsi
+@@ -6,8 +6,8 @@
+ 
+ # BrandFullNameInternal is used for some registry and file system values that
+ # should not contain release that may be in the BrandFullName (e.g. Beta 1, 
etc.)
+-!define BrandFullNameInternal Instantbird
+-!define CompanyName   Instantbird
+-!define URLInfoAbout  http://www.instantbird.com/;
+-!define URLUpdateInfo http://www.instantbird.com/;
++!define BrandFullNameInternal Tor Messenger
++!define CompanyName   Tor Messenger
++!define URLInfoAbout  https://www.torproject.org;
++!define URLUpdateInfo https://www.torproject.org;
+ 
+diff --git a/im/branding/messenger/locales/en-US/brand.dtd 
b/im/branding/messenger/locales/en-US/brand.dtd
+index c569ebb..2d6a5d8 100644
+--- a/im/branding/messenger/locales/en-US/brand.dtd
 b/im/branding/messenger/locales/en-US/brand.dtd
+@@ -4,7 +4,7 @@
+ 
+ !-- nightly branding --
+ 
+-!ENTITY  brandShortNameInstantbird
+-!ENTITY  brandFullName Instantbird - Nightly
++!ENTITY  brandShortNameTor Messenger
++!ENTITY  brandFullName Tor Messenger - Alpha
+ !ENTITY  brandMotto'Cause geeks can also do magic!
+-!ENTITY  vendorShortName   Instantbird
++!ENTITY  vendorShortName   Tor Messenger
+diff --git a/im/branding/messenger/locales/en-US/brand.properties 
b/im/branding/messenger/locales/en-US/brand.properties
+index f949ced..93528a3 100644
+--- a/im/branding/messenger/locales/en-US/brand.properties
 b/im/branding/messenger/locales/en-US/brand.properties
+@@ -2,6 +2,6 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-brandShortName=Instantbird
+-brandFullName=Instantbird - Nightly
+-vendorShortName=Instantbird
++brandShortName=Tor Messenger
++brandFullName=Tor Messenger - Alpha
++vendorShortName=Tor Messenger
diff --git a/projects/instantbird/name.patch b/projects/instantbird/name.patch
deleted file mode 100644
index 378c6db..000
--- a/projects/instantbird/name.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/im/branding/messenger/branding.nsi 
b/im/branding/messenger/branding.nsi
-index e5b5348..276722b 100755
 a/im/branding/messenger/branding.nsi
-+++ b/im/branding/messenger/branding.nsi
-@@ -6,8 +6,8 @@
- 
- # BrandFullNameInternal is used for some registry and file system values that
- # should not contain release that may be in the BrandFullName (e.g. Beta 1, 
etc.)
--!define BrandFullNameInternal Instantbird
--!define CompanyName   Instantbird
--!define URLInfoAbout  http://www.instantbird.com/;
--!define URLUpdateInfo http://www.instantbird.com/;
-+!define BrandFullNameInternal Tor Messenger
-+!define CompanyName   Tor Messenger
-+!define URLInfoAbout  https://www.torproject.org;
-+!define URLUpdateInfo https://www.torproject.org;
- 
-diff --git a/im/branding/messenger/locales/en-US/brand.dtd 
b/im/branding/messenger/locales/en-US/brand.dtd
-index c569ebb..2d6a5d8 100644
 a/im/branding/messenger/locales/en-US/brand.dtd
-+++ b/im/branding/messenger/locales/en-US/brand.dtd
-@@ -4,7 +4,7 @@
- 
- !-- nightly branding --
- 
--!ENTITY  brandShortNameInstantbird
--!ENTITY  brandFullName Instantbird - Nightly
-+!ENTITY  brandShortNameTor Messenger
-+!ENTITY  brandFullName Tor Messenger - Alpha
- !ENTITY  brandMotto'Cause geeks can also do magic!
--!ENTITY  vendorShortName   Instantbird
-+!ENTITY  vendorShortName   Tor Messenger
-diff --git a/im/branding/messenger/locales/en-US/brand.properties 
b/im/branding/messenger/locales/en-US/brand.properties
-index f949ced..93528a3 100644
 a/im/branding/messenger/locales/en-US/brand.properties
-+++ b/im/branding/messenger/locales/en-US/brand.properties
-@@ -2,6 +2,6 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--brandShortName=Instantbird
--brandFullName=Instantbird - Nightly
--vendorShortName=Instantbird
-+brandShortName=Tor Messenger
-+brandFullName=Tor Messenger - Alpha
-+vendorShortName=Tor Messenger

[tor-commits] [tor-browser-bundle/master] Bug 15747: Improve Linux startup script argument handling.

2015-04-21 Thread mikeperry 
commit 063f65368f32600904945399f7024be3a6ae1f5f
Author: Mike Perry mikeperry-...@torproject.org
Date:   Mon Apr 20 16:18:38 2015 -0700

Bug 15747: Improve Linux startup script argument handling.

This commit makes the following changes:

1. Allows multiple arguments to be specified at once to start-tor-browser
2. Separates --debug from file logging (and creates --log)
3. Solves #15739 by creating -v and --verbose as --debug aliases
4. Solves #15740 by creating -h and -? aliases for --help.
5. Solves #15741 by creating --detach and using it from the .desktop file
---
 RelativeLink/start-tor-browser |  128 ++--
 RelativeLink/start-tor-browser.desktop |   29 
 2 files changed, 103 insertions(+), 54 deletions(-)

diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser
index 098f506..940ec96 100755
--- a/RelativeLink/start-tor-browser
+++ b/RelativeLink/start-tor-browser
@@ -3,8 +3,6 @@
 # GNU/Linux does not really require something like RelativeLink.c
 # However, we do want to have the same look and feel with similar features.
 #
-# To run in debug mode simply pass --debug
-#
 # Copyright 2015 The Tor Project.  See LICENSE for licensing information.
 
 complain_dialog_title=Tor Browser
@@ -35,8 +33,8 @@ complain () {
# Trim leading newlines, to avoid breaking formatting in some dialogs.
complain_message=`echo $1 | sed '/./,$!d'`
 
-   # If we're being run in debug mode, complain to stderr.
-   if [ $debug -eq 1 ]; then
+   # If we're being run in debug/verbose mode, complain to stderr.
+   if [ $show_output -eq 1 ]; then
echo $complain_message 2
return
fi
@@ -98,30 +96,82 @@ if [ `id -u` -eq 0 ]; then
exit 1
 fi
 
-debug=0
+tbb_usage () {
+printf \nTor Browser Script Options\n
+printf   --verbose Display Tor and Firefox output in the 
terminal\n
+printf   --log [file]  Record Tor and Firefox output in file 
(default: tor-browser.log)\n
+printf   --detach  Detach from terminal and run Tor Browser in 
the background.\n
+printf   --register-appRegister Tor Browser as a desktop app for this 
user\n
+printf   --unregister-app  Unregister Tor Browser as a desktop app for 
this user\n
+}
+log_output=0
+show_output=0
+detach=0
 show_usage=0
 register_desktop_app=0
-# !!! We may have more than one argument, changed -eq to -ge in if  elif 
clauses below
-if [ $# -ge 1 -a \( x$1 = x--debug -o x$1 = x-debug \) ]; then
-   debug=1
-   shift # pop the debug argument
-   printf \nDebug enabled.\n\n
-elif [ $# -ge 1 -a \( x$1 = x--register-app -o x$1 = x-register-app 
\) ]; then
-   register_desktop_app=1
-   shift # pop the register arg
-elif [ $# -ge 1 -a \( x$1 = x--unregister-app -o x$1 = 
x-unregister-app \) ]; then
-   register_desktop_app=-1
-   shift # pop the register arg
-elif [ $# -ge 1 -a \( x$1 = x--help -o x$1 = x-help \) ]; then
-show_usage=1
-else
+logfile=/dev/null
+while :
+do
+case $1 in
+  --detach)
+  detach=1
+  shift
+  ;;
+  -v | --verbose | -d | --debug)
+  show_output=1
+  verbose_arg=$2
+  shift
+  ;;
+  -h | -? | --help | -help)
+  show_usage=1
+  show_output=1
+  shift
+  ;;
+  -l | --log)
+  if [ -z $2 -o ${2:0:1} == - ]; then
+ printf Logging Tor Browser debug information to 
tor-browser.log\n
+ logfile=../tor-browser.log
+  elif [ ${2:0:1} == / -o ${2:0:1} == ~ ]; then
+ printf Logging Tor Browser debug information to %s\n $2
+ logfile=$2
+ shift
+  else
+ printf Logging Tor Browser debug information to %s\n $2
+ logfile=../$2
+ shift
+  fi
+  log_output=1
+  shift
+  ;;
+  --register-app)
+  register_desktop_app=1
+  show_output=1
+  shift
+  ;;
+  --unregister-app)
+  register_desktop_app=-1
+  show_output=1
+  shift
+  ;;
+  *) # No more options
+  break
+  ;;
+esac
+done
+
+# We can't detach and show output at the same time..
+if [ $show_output -eq 1 -a $detach -eq 1 ]; then
+detach=0
+fi
+
+if [ $show_output -eq 0 ]; then
 # If the user hasn't requested 'debug mode' or --help, close stdout and 
stderr,
 # to keep Firefox and the stuff loaded by/for it (including the
 # system's shared-library loader) from printing messages to
 # $HOME/.xsession-errors or other files. (Users wouldn't have seen
 # messages there anyway.)
-exec /dev/null
-exec 2/dev/null
+exec  $logfile
+exec 2 $logfile
 fi
 
 # If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority
@@ -186,7 +236,7 @@ fi
 cp start-tor-browser.desktop ../
 sed -i -e

[tor-commits] [tor-browser-bundle/master] Merge branch 'bug15747'

2015-04-21 Thread mikeperry 
commit ee481a3b5c04136c4f1cc4aa4f0d3c2c7a219d5f
Merge: c5e0b0b 063f653
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 15:08:46 2015 -0700

Merge branch 'bug15747'

 RelativeLink/start-tor-browser |  128 ++--
 RelativeLink/start-tor-browser.desktop |   29 
 2 files changed, 103 insertions(+), 54 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.

2015-04-21 Thread mikeperry 
commit 844949ea30735a7494099aeb2be5b61c20583285
Author: Georg Koppen g...@torproject.org
Date:   Tue Apr 21 14:59:41 2015 +

fixup! TB4: Tor Browser's Firefox preference overrides.
---
 browser/app/profile/000-tor-browser.js |2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 192159b..a277e9d 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -87,6 +87,8 @@ pref(javascript.use_us_english_locale, true);
 // pref(intl.accept_languages, en-us, en); // Set by Torbutton
 // pref(intl.accept_charsets, iso-8859-1,*,utf-8); // Set by Torbutton
 // pref(intl.charsetmenu.browser.cache, UTF-8); // Set by Torbutton
+// Disable device sensors as possible fingerprinting vector (bug 15758)
+pref(device.sensors.enabled, false);
 
 // Third party stuff
 pref(network.cookie.cookieBehavior, 1);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.

2015-04-21 Thread mikeperry 
commit 8dff562d0af91529afee439af9ea5e7bb33d58f8
Author: Georg Koppen g...@torproject.org
Date:   Tue Apr 21 13:20:57 2015 +

fixup! TB4: Tor Browser's Firefox preference overrides.
---
 browser/app/profile/000-tor-browser.js |2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 192159b..7967db1 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -87,6 +87,8 @@ pref(javascript.use_us_english_locale, true);
 // pref(intl.accept_languages, en-us, en); // Set by Torbutton
 // pref(intl.accept_charsets, iso-8859-1,*,utf-8); // Set by Torbutton
 // pref(intl.charsetmenu.browser.cache, UTF-8); // Set by Torbutton
+// Disable video statistics fingerprinting vector (bug 15757)
+pref(media.video_stats.enabled, false);
 
 // Third party stuff
 pref(network.cookie.cookieBehavior, 1);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_15758' into tor-browser-31.6.0esr-4.5-1

2015-04-21 Thread mikeperry 
commit 89bd8f1c5b3e58dfbf9cf33692abfb2be78cd6cf
Merge: ab48482 844949e
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 15:29:02 2015 -0700

Merge remote-tracking branch 'gk/bug_15758' into tor-browser-31.6.0esr-4.5-1

Conflicts:
browser/app/profile/000-tor-browser.js

 browser/app/profile/000-tor-browser.js |2 ++
 1 file changed, 2 insertions(+)

diff --cc browser/app/profile/000-tor-browser.js
index 7967db1,a277e9d..e7e4ca9
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@@ -87,8 -87,8 +87,10 @@@ pref(javascript.use_us_english_locale
  // pref(intl.accept_languages, en-us, en); // Set by Torbutton
  // pref(intl.accept_charsets, iso-8859-1,*,utf-8); // Set by Torbutton
  // pref(intl.charsetmenu.browser.cache, UTF-8); // Set by Torbutton
 +// Disable video statistics fingerprinting vector (bug 15757)
 +pref(media.video_stats.enabled, false);
+ // Disable device sensors as possible fingerprinting vector (bug 15758)
+ pref(device.sensors.enabled, false);
  
  // Third party stuff
  pref(network.cookie.cookieBehavior, 1);

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_15757' into tor-browser-31.6.0esr-4.5-1

2015-04-21 Thread mikeperry 
commit ab48482bd24a4389a3db2438be807dc303ca2933
Merge: f0fe46b 8dff562
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 15:28:28 2015 -0700

Merge remote-tracking branch 'gk/bug_15757' into tor-browser-31.6.0esr-4.5-1

 browser/app/profile/000-tor-browser.js |2 ++
 1 file changed, 2 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Update changelog for bugs 15757 and 15758.

2015-04-21 Thread mikeperry 
commit 1e294bc7704cf6daf7b83aa54985ab5c78a11d28
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 15:31:31 2015 -0700

Update changelog for bugs 15757 and 15758.
---
 Bundle-Data/Docs/ChangeLog.txt |2 ++
 1 file changed, 2 insertions(+)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 70fe201..bbd4bd8 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -23,6 +23,8 @@ Tor Browser 4.5 -- Apr 28 2015
* Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism
* Bug 14716: Fix issues with HTTP Auth usage and TLS connection info display
* Bug 15562: Disable Javascript SharedWorkers due to third party tracking
+   * Bug 15757: Disable Mozilla video statistics API extensions
+   * Bug 15758: Disable Device Sensor APIs
  * Linux
* Bug 15747: Improve start-tor-browser argument handling
* Bug 15672: Provide desktop app registration+unregistration for Linux

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Bug 15539: Make stripping signatures reproducible

2015-04-21 Thread mikeperry 
commit e487b6ffca7b023442fd8820eed8345a20310fde
Author: Georg Koppen g...@torproject.org
Date:   Tue Apr 21 11:32:00 2015 +

Bug 15539: Make stripping signatures reproducible

NSIS is neither padding properly nor creating a correct PE-file
checksum. This makes it hard to verify that the Windows installer we
ship is actually matching the one we got built reproducibly.

This fix makes sure that we pad the .exe where needed and that the
PE-file checksum is generated.

Thanks to a cypherpunk for this workaround idea.
---
 gitian/build-helpers/pe_checksum_fix.py  |   56 ++
 gitian/descriptors/windows/gitian-bundle.yml |   14 +++
 2 files changed, 70 insertions(+)

diff --git a/gitian/build-helpers/pe_checksum_fix.py 
b/gitian/build-helpers/pe_checksum_fix.py
new file mode 100755
index 000..101e77f
--- /dev/null
+++ b/gitian/build-helpers/pe_checksum_fix.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2015, The Tor Project, Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#
+# * Neither the names of the copyright owners nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+NSIS is neither padding nor calculating the PE-file checksum. But the tool
+we use for signing and the tools for stripping the signature do which leads to 
a
+SHA256 mismatch if one tries to check that the binary we offer is actually the
+the one we got from our reproducible builds.
+
+This small Python snippet does both things: It pads the .exe if necessary and 
it
+recalculates the PE-file checksum. Details of the discussion can be foun in bug
+15339: https://bugs.torproject.org/15539.
+
+Thanks to a cypherpunk for this workaround idea.
+
+
+import pefile;
+
+f = open('torbrowser-install-tmp.exe')
+exe = f.read()
+f.close()
+remainder = len(exe) % 8
+if remainder  0:
+exe += '\0' * (8 - remainder)
+pef = pefile.PE(data=exe, fast_load=True)
+pef.OPTIONAL_HEADER.CheckSum = pef.generate_checksum()
+pef.write(filename='torbrowser-install-tmp2.exe')
diff --git a/gitian/descriptors/windows/gitian-bundle.yml 
b/gitian/descriptors/windows/gitian-bundle.yml
index 92b9382..54ea258 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -9,6 +9,9 @@ packages:
 - unzip
 - zip
 - nsis
+# Needed to compensate NSIS's failure of regenerating the PE-file checksum and
+# proper padding.
+- python-pefile
 # These three packages are needed for assembling the HTTPS-Everywhere rules
 # since 5.0.
 - python-lxml
@@ -43,6 +46,7 @@ files:
 - versions
 - mar-tools-win32.zip
 - tbb-docs.zip
+- pe_checksum_fix.py
 script: |
   INSTDIR=$HOME/install
   source versions
@@ -145,6 +149,11 @@ script: |
   MAR_FILE=tor-browser-win32-${TORBROWSER_VERSION}_en-US.mar
   MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff.exe 
$MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE Tor Browser/Browser
   makensis torbrowser.nsi
+  # Working around NSIS braindamage
+  mv torbrowser-install.exe torbrowser-install-tmp.exe
+  python ~/build/pe_checksum_fix.py
+  mv torbrowser-install-tmp2.exe torbrowser-install.exe
+  rm torbrowser-install-tmp.exe
   mv torbrowser-install.exe 
$OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_en-US.exe
   #
   unzip ../win32-langpacks.zip
@@ -181,6 +190,11 @@ script: |
 MAR_FILE=tor-browser-win32-${TORBROWSER_VERSION}_$LANG.mar
 MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff.exe 
$MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE Tor Browser/Browser
 makensis torbrowser.nsi
+# Working around NSIS braindamage
+mv torbrowser-install.exe

[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'gk/bug_15539_v4'

2015-04-21 Thread mikeperry 
commit 3a8088e99b4e2d2a0bdac24b42c2cd285079cee0
Merge: ee481a3 e487b6f
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 15:17:58 2015 -0700

Merge remote-tracking branch 'gk/bug_15539_v4'

 gitian/build-helpers/pe_checksum_fix.py  |   56 ++
 gitian/descriptors/windows/gitian-bundle.yml |   14 +++
 2 files changed, 70 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers

2015-04-21 Thread mikeperry 
commit 0d67ab406bdd3cf095802cb25c081641aa1f0bcc
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Sun Apr 12 13:47:55 2015 -0700

Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers
---
 content/base/src/ThirdPartyUtil.cpp  |9 +
 content/base/src/nsHostObjectProtocolHandler.cpp |   23 --
 dom/workers/URL.cpp  |7 +++
 netwerk/base/public/mozIThirdPartyUtil.idl   |   15 ++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/content/base/src/ThirdPartyUtil.cpp 
b/content/base/src/ThirdPartyUtil.cpp
index 695392f..0e037d1 100644
--- a/content/base/src/ThirdPartyUtil.cpp
+++ b/content/base/src/ThirdPartyUtil.cpp
@@ -635,3 +635,12 @@ ThirdPartyUtil::GetFirstPartyHostForIsolation(nsIURI 
*aFirstPartyURI,
   aHost.Append(--);
   return NS_OK;
 }
+
+NS_IMETHODIMP
+ThirdPartyUtil::GetFirstPartyHostFromCaller(nsACString aHost) {
+  nsCOMPtrnsIURI uri;
+  nsresult rv = GetFirstPartyIsolationURI(nullptr,
+ nsContentUtils::GetDocumentFromCaller(), getter_AddRefs(uri));
+  NS_ENSURE_SUCCESS(rv, rv);
+  return GetFirstPartyHostForIsolation(uri, aHost);
+}
diff --git a/content/base/src/nsHostObjectProtocolHandler.cpp 
b/content/base/src/nsHostObjectProtocolHandler.cpp
index 10ec44c..e578804 100644
--- a/content/base/src/nsHostObjectProtocolHandler.cpp
+++ b/content/base/src/nsHostObjectProtocolHandler.cpp
@@ -15,6 +15,7 @@
 #include mozilla/dom/MediaSource.h
 #include nsIMemoryReporter.h
 #include mozilla/Preferences.h
+#include mozIThirdPartyUtil.h
 
 // ---
 // Hash table
@@ -24,9 +25,20 @@ struct DataInfo
   nsCOMPtrnsISupports mObject;
   nsCOMPtrnsIPrincipal mPrincipal;
   nsCString mStack;
+  nsCString mFirstPartyHost;
 };
 
 static nsClassHashtablensCStringHashKey, DataInfo* gDataTable;
+static nsCOMPtrmozIThirdPartyUtil gThirdPartyUtilService;
+
+static nsCString GetFirstPartyHostFromCaller() {
+  if (!gThirdPartyUtilService) {
+gThirdPartyUtilService = do_GetService(THIRDPARTYUTIL_CONTRACTID);
+  }
+  nsCString host;
+  gThirdPartyUtilService-GetFirstPartyHostFromCaller(host);
+  return host;
+}
 
 // Memory reporting for the hash table.
 namespace mozilla {
@@ -290,6 +302,8 @@ nsHostObjectProtocolHandler::AddDataEntry(const nsACString 
aScheme,
 
   info-mObject = aObject;
   info-mPrincipal = aPrincipal;
+  // Record the first party host that originated this object.
+  info-mFirstPartyHost = GetFirstPartyHostFromCaller();
   mozilla::BlobURLsReporter::GetJSStackForBlob(info);
 
   gDataTable-Put(aUri, info);
@@ -401,7 +415,10 @@ GetDataObject(nsIURI* aURI)
   aURI-GetSpec(spec);
 
   DataInfo* info = GetDataInfo(spec);
-  return info ? info-mObject : nullptr;
+  // Deny access to this object if the current first-party host
+  // doesn't match the originating first-party host.
+  return (info  info-mFirstPartyHost == GetFirstPartyHostFromCaller())
+ ? info-mObject : nullptr;
 }
 
 // ---
@@ -457,7 +474,9 @@ nsHostObjectProtocolHandler::NewChannel(nsIURI* uri, 
nsIChannel* *result)
 
   DataInfo* info = GetDataInfo(spec);
 
-  if (!info) {
+  // Deny access to this URI if the current first party host
+  // doesn't match the first party host when it was created.
+  if (!info || (info-mFirstPartyHost != GetFirstPartyHostFromCaller())) {
 return NS_ERROR_DOM_BAD_URI;
   }
   nsCOMPtrnsIDOMBlob blob = do_QueryInterface(info-mObject);
diff --git a/dom/workers/URL.cpp b/dom/workers/URL.cpp
index f80594e..d52e4c6 100644
--- a/dom/workers/URL.cpp
+++ b/dom/workers/URL.cpp
@@ -894,6 +894,13 @@ URL::CreateObjectURL(const GlobalObject aGlobal, 
JSObject* aBlob,
   JSContext* cx = aGlobal.GetContext();
   WorkerPrivate* workerPrivate = GetWorkerPrivateFromContext(cx);
 
+  if (!workerPrivate-IsChromeWorker()) {
+workerPrivate-ReportError(cx, Worker attempted to use createObjectURL; 
denied., nullptr);
+NS_NAMED_LITERAL_STRING(argStr, URL.createObjectURL);
+aRv.ThrowTypeError(MSG_METHOD_THIS_UNWRAPPING_DENIED, argStr);
+return;
+  }
+
   nsCOMPtrnsIDOMBlob blob = file::GetDOMBlobFromJSObject(aBlob);
   if (!blob) {
 SetDOMStringToNull(aResult);
diff --git a/netwerk/base/public/mozIThirdPartyUtil.idl 
b/netwerk/base/public/mozIThirdPartyUtil.idl
index 0bb632b..0b0f410 100644
--- a/netwerk/base/public/mozIThirdPartyUtil.idl
+++ b/netwerk/base/public/mozIThirdPartyUtil.idl
@@ -246,6 +246,21 @@ interface mozIThirdPartyUtil : nsISupports
* for which we generate a pseudo host.
*/
   AUTF8String getFirstPartyHostForIsolation(in nsIURI aFirstPartyURI);
+
+  /**
+   * getFirstPartyHostFromCaller
+   *
+   * Obtain the host or pseudo-host for the first party URI belonging
+   * to the calling document. See getFirstPartyHostForIsolation(...) for
+   * examples.
+   *
+   * @return host or pseudo

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'arthur/15502+8' into tor-browser-31.6.0esr-4.5-1

2015-04-21 Thread mikeperry 
commit 71adcfc9a5adf7aeeed0dfa2719ccd59cc84881e
Merge: 89bd8f1 f4f2caa
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 18:05:08 2015 -0700

Merge remote-tracking branch 'arthur/15502+8' into 
tor-browser-31.6.0esr-4.5-1

 content/base/src/ThirdPartyUtil.cpp  |9 ++
 content/base/src/nsHostObjectProtocolHandler.cpp |   23 -
 content/base/test/bug15502_page_blobify.html |   26 ++
 content/base/test/bug15502_page_deblobify.html   |   31 +++
 content/base/test/bug15502_tab.html  |   39 
 content/base/test/bug15502_utils.js  |  104 ++
 content/base/test/bug15502_worker_blobify.html   |   28 ++
 content/base/test/bug15502_worker_blobify.js |   12 +++
 content/base/test/bug15502_worker_deblobify.html |   30 +++
 content/base/test/bug15502_worker_deblobify.js   |   24 +
 content/base/test/mochitest.ini  |9 ++
 content/base/test/test_tor_bug15502.html |   92 +++
 dom/workers/URL.cpp  |7 ++
 netwerk/base/public/mozIThirdPartyUtil.idl   |   15 
 14 files changed, 447 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-launcher/master] Update translations.

2015-04-21 Thread mikeperry 
commit 1be49192e9d29f2b541f723068c3c7cb986ccbd5
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 19:56:40 2015 -0700

Update translations.
---
 src/chrome/locale/bg/network-settings.dtd |6 ++--
 src/chrome/locale/ca/network-settings.dtd |2 +-
 src/chrome/locale/ca/progress.dtd |2 +-
 src/chrome/locale/cs/network-settings.dtd |8 ++---
 src/chrome/locale/eu/network-settings.dtd |8 ++---
 src/chrome/locale/id/network-settings.dtd |8 ++---
 src/chrome/locale/lv/network-settings.dtd |8 ++---
 src/chrome/locale/sr/network-settings.dtd |2 +-
 src/chrome/locale/sr@latin/network-settings.dtd   |   34 ++---
 src/chrome/locale/sr@latin/torlauncher.properties |4 +--
 src/chrome/locale/zh-CN/network-settings.dtd  |4 +--
 11 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/chrome/locale/bg/network-settings.dtd 
b/src/chrome/locale/bg/network-settings.dtd
index 3813505..6b1c255 100644
--- a/src/chrome/locale/bg/network-settings.dtd
+++ b/src/chrome/locale/bg/network-settings.dtd
@@ -9,7 +9,7 @@
 
 !ENTITY torSettings.firstQuestion Кое от следните описва 
най-добре вашата ситуация?
 !ENTITY torSettings.configurePrompt1 Интернет връзката на 
този компютър е цензурирана или минава 
през proxy сървър.
-!ENTITY torSettings.configurePrompt2 I need to configure bridge or local 
proxy settings.
+!ENTITY torSettings.configurePrompt2 Трябва да 
конфигурирам bridge или proxy настройки.
 !ENTITY torSettings.configure Конфигурирай
 !ENTITY torSettings.connectPrompt2 Бих искал да се свържа 
директно към Tor мрежата.
 !ENTITY torSettings.connectPrompt3 Това ще работи при 
повечето ситуации.
@@ -17,7 +17,7 @@
 
 !ENTITY torSettings.proxyQuestion Този компютър използва 
ли локално прокси за достъп до Интернет?
 !-- see https://www.torproject.org/docs/proxychain.html.en --
-!ENTITY torSettings.proxyHelp If you are not sure how to answer this 
question, look at the Internet settings in another browser to see whether it is 
configured to use a local proxy.
+!ENTITY torSettings.proxyHelp Ако не сте сигурни как да 
отговорите на този въпрос проверете 
интернет настройките на друг браузър,за да 
видите дали е настроен да използва прокси.
 !ENTITY torSettings.enterProxy Въведете настройките за 
прокси.
 !ENTITY torSettings.bridgeQuestion Блокирани или 
цензурирани ли са връзките към Tor Мрежата 
от вашият Интернет Доставчик(ISP)?
 !ENTITY torSettings.bridgeHelp Ако не сте сигурни как да 
отговорите на този въпрос, изберете No.#160; 
Ако изберете Yes, вие ще бъдете помолен да 
конфигурирате Tor Bridges, непубликувани relays 
които правят блокирането на връзката към Tor 
Network по трудна.
@@ -30,7 +30,7 @@
 
 !ENTITY torsettings.optional Допълнителен
 
-!ENTITY torsettings.useProxy.checkbox This computer needs to use a local 
proxy to access the Internet
+!ENTITY torsettings.useProxy.checkbox Необходимо е 
използването на локален прокси сървър за 
достъп до Интернет
 !ENTITY torsettings.useProxy.type Прокси Тип:
 !ENTITY torsettings.useProxy.address Адрес:
 !ENTITY torsettings.useProxy.address.placeholder IP адрес или х
ост
diff --git a/src/chrome/locale/ca/network-settings.dtd 
b/src/chrome/locale/ca/network-settings.dtd
index a8996f7..7bf1ca5 100644
--- a/src/chrome/locale/ca/network-settings.dtd
+++ b/src/chrome/locale/ca/network-settings.dtd
@@ -1,4 +1,4 @@
-!ENTITY torsettings.dialog.title Configuració Xarxa Tor
+!ENTITY torsettings.dialog.title Configuració de la Xarxa Tor
 
 !-- For first run wizard: --
 
diff --git a/src/chrome/locale/ca/progress.dtd 
b/src/chrome/locale/ca/progress.dtd
index 18b34e0..cb62f1b 100644
--- a/src/chrome/locale/ca/progress.dtd
+++ b/src/chrome/locale/ca/progress.dtd
@@ -1,4 +1,4 @@
-!ENTITY torprogress.dialog.title Estat del Tor
+!ENTITY torprogress.dialog.title Estat de Tor
 !ENTITY torprogress.openSettings Obrir preferències.
 !ENTITY torprogress.heading S'està connectant a la xarxa Tor
 !ENTITY torprogress.pleaseWait Si us plau, espereu mentre establim una 
connexió a la xarxa Tor.
diff --git a/src/chrome/locale/cs/network-settings.dtd 
b/src/chrome/locale/cs/network-settings.dtd
index ad8842d..7554d91 100644

[tor-commits] [tor-launcher/master] Bump version to 0.2.7.4.

2015-04-21 Thread mikeperry 
commit 360f70048a5e2338c52112a6507ee220ea330866
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 19:58:25 2015 -0700

Bump version to 0.2.7.4.
---
 src/install.rdf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/install.rdf b/src/install.rdf
index c27be00..b2ca19c 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
 em:creatorThe Tor Project, Inc./em:creator
 em:contributorPearl Crescent, LLC/em:contributor
 em:idtor-launc...@torproject.org/em:id
-em:version0.2.7.3/em:version
+em:version0.2.7.4/em:version
 
em:homepageURLhttps://www.torproject.org/projects/torbrowser.html/em:homepageURL
 em:updateURLhttps://127.0.0.1//em:updateURL
 !--

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Import translations.

2015-04-21 Thread mikeperry 
commit 6530c29c248f035050dc978018230e3df83243dd
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 19:55:55 2015 -0700

Import translations.
---
 src/chrome/locale/ar/torbutton.properties|2 +-
 src/chrome/locale/de/torbutton.dtd   |4 +-
 src/chrome/locale/de/torbutton.properties|4 +-
 src/chrome/locale/es/torbutton.properties|2 +-
 src/chrome/locale/eu/aboutTor.dtd|2 +-
 src/chrome/locale/eu/torbutton.dtd   |8 ++--
 src/chrome/locale/eu/torbutton.properties|2 +-
 src/chrome/locale/fa/torbutton.properties|4 +-
 src/chrome/locale/fr/torbutton.dtd   |   34 -
 src/chrome/locale/fr/torbutton.properties|6 +--
 src/chrome/locale/it/torbutton.properties|   12 +++---
 src/chrome/locale/ja/torbutton.properties|2 +-
 src/chrome/locale/ko/torbutton.properties|2 +-
 src/chrome/locale/nl/torbutton.dtd   |   30 +++
 src/chrome/locale/nl/torbutton.properties|2 +-
 src/chrome/locale/pl/torbutton.properties|2 +-
 src/chrome/locale/pt/torbutton.properties|2 +-
 src/chrome/locale/ru/torbutton.dtd   |   50 -
 src/chrome/locale/ru/torbutton.properties|   18 -
 src/chrome/locale/sv/torbutton.dtd   |   52 +-
 src/chrome/locale/sv/torbutton.properties|   14 +++
 src/chrome/locale/tr/torbutton.properties|6 +--
 src/chrome/locale/vi/torbutton.properties|2 +-
 src/chrome/locale/zh-CN/aboutTor.dtd |2 +-
 src/chrome/locale/zh-CN/torbutton.dtd|   18 -
 src/chrome/locale/zh-CN/torbutton.properties |   22 +--
 26 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/src/chrome/locale/ar/torbutton.properties 
b/src/chrome/locale/ar/torbutton.properties
index 456399a..ef6dd71 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = البرامج 
الإضافية مثل فلا
 torbutton.popup.never_ask_again = لا تسألني مرة اخري
 torbutton.popup.confirm_newnym = متصفح تور
 
-torbutton.slider_notification = The green onion menu has now a security slider 
which lets you adjust your security level. Check it out!
+torbutton.slider_notification = The green onion menu now has a security slider 
which lets you adjust your security level. Check it out!
 torbutton.slider_notification_button = Open security settings
 
 torbutton.maximize_warning = Maximizing Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
diff --git a/src/chrome/locale/de/torbutton.dtd 
b/src/chrome/locale/de/torbutton.dtd
index 622cfc1..dbf16ac 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -163,8 +163,8 @@
 !ENTITY torbutton.prefs.sec_some_jit_desc Einige JavaScript 
Ausführungsoptimierungen sind unterbunden.
 !ENTITY torbutton.prefs.sec_jit_desc_tooltip ION JIT, Typinferenz, ASM.JS.
 !ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip JIT-Basis.
-!ENTITY torbutton.prefs.sec_jit_slower_desc Scripts können auf manchen 
seiten langsamer laufen.
-!ENTITY torbutton.prefs.sec_jar_desc JAR-Dateieen sind im Web extrem selten, 
können aaber eine Quelle von XSS und anderen Attacken sein.
+!ENTITY torbutton.prefs.sec_jit_slower_desc Scripts können auf manchen 
Seiten langsamer laufen.
+!ENTITY torbutton.prefs.sec_jar_desc JAR-Dateien sind im Web extrem selten, 
können aber eine Quelle von XSS und anderen Attacken sein.
 !ENTITY torbutton.prefs.sec_jar_tooltip JAR-Dateien sind sehr selten im 
Internet, aber sie können eine Quelle von XSS (Webseitenübergreifendes 
Skripting) und anderer Angriffe sein.
 !ENTITY torbutton.prefs.sec_mathml_desc Manche Vorgänge zur Anzeige von 
mathematischen Gleichungen sind deaktiviert.
 !ENTITY torbutton.prefs.sec_mathml_desc_tooltip MathML ist blockiert.
diff --git a/src/chrome/locale/de/torbutton.properties 
b/src/chrome/locale/de/torbutton.properties
index ed2941d..53bc747 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Erweiterungen wie Flash 
können ihre Privatsph
 torbutton.popup.never_ask_again = Nicht mehr nachfragen
 torbutton.popup.confirm_newnym = Tor-Browser wird alle Fenster und Reiter 
schließen. Alle Internetseitensitzungen gehen verloren.\n\nTor-Browser jetzt 
neu starten, um Ihre Identität zurückzusetzen?\n\n
 
-torbutton.slider_notification = Das grüne Onion Menü hat jetzt einen 
Sicherheits-Regler welches Ihr Sicherheits-Level einstellt. Probier's aus!
+torbutton.slider_notification = Das grüne Onion-Menü hat jetzt einen 
Sicherheitsschieberegler, mit dem Sie Ihre Sicherheitsstufe anpassen

[tor-commits] [tor-browser/tor-browser-31.6.0esr-4.5-1] Bug #15502, Part 2: Regression tests for blob URL isolation

2015-04-21 Thread mikeperry 
commit f4f2caa26dd2d15e8f99d0a1357361da43e4fd2f
Author: Arthur Edelstein arthuredelst...@gmail.com
Date:   Sat Apr 18 17:37:21 2015 -0700

Bug #15502, Part 2: Regression tests for blob URL isolation
---
 content/base/test/bug15502_page_blobify.html |   26 ++
 content/base/test/bug15502_page_deblobify.html   |   31 +++
 content/base/test/bug15502_tab.html  |   39 
 content/base/test/bug15502_utils.js  |  104 ++
 content/base/test/bug15502_worker_blobify.html   |   28 ++
 content/base/test/bug15502_worker_blobify.js |   12 +++
 content/base/test/bug15502_worker_deblobify.html |   30 +++
 content/base/test/bug15502_worker_deblobify.js   |   24 +
 content/base/test/mochitest.ini  |9 ++
 content/base/test/test_tor_bug15502.html |   92 +++
 10 files changed, 395 insertions(+)

diff --git a/content/base/test/bug15502_page_blobify.html 
b/content/base/test/bug15502_page_blobify.html
new file mode 100644
index 000..d883929
--- /dev/null
+++ b/content/base/test/bug15502_page_blobify.html
@@ -0,0 +1,26 @@
+!DOCTYPE HTML
+html
+!--
+https://bugs.torproject.org/15502
+--
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titlePage blobifier for Tor Browser Bug 15502/title
+  script type=text/javascript;version=1.7 src=bug15502_utils.js/script
+/head
+body
+div id=display style=white-space:pre; font-family:monospace; 
display:inline;/div
+
+script type=text/javascript;version=1.7
+
+Task.spawn(function* () {
+  sendMessage(window.parent, ready);
+  let message = yield receiveMessage(window.parent),
+  blobURL = stringToBlobURL(message);
+  sendMessage(window.parent, blobURL);
+  appendLine(display, message +  -  + blobURL);
+});
+
+/script
+/body
+/html
diff --git a/content/base/test/bug15502_page_deblobify.html 
b/content/base/test/bug15502_page_deblobify.html
new file mode 100644
index 000..e8cbd51
--- /dev/null
+++ b/content/base/test/bug15502_page_deblobify.html
@@ -0,0 +1,31 @@
+!DOCTYPE HTML
+html
+!--
+https://bugs.torproject.org/15502
+--
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titlePage deblobifier for Tor Browser Bug 15502/title
+  script type=text/javascript;version=1.7 src=bug15502_utils.js/script
+/head
+body
+div id=display style=white-space:pre; font-family:monospace; 
display:inline;/div
+
+script type=text/javascript;version=1.7
+
+Task.spawn(function* () {
+  sendMessage(window.parent, ready);
+  let blobURL = yield receiveMessage(window.parent),
+  string;
+  try {
+string = yield blobURLtoString(blobURL);
+  } catch (e) {
+string = e.message;
+  }
+  sendMessage(window.parent, string);
+  appendLine(display, blobURL +  -  + string);
+});
+
+/script
+/body
+/html
diff --git a/content/base/test/bug15502_tab.html 
b/content/base/test/bug15502_tab.html
new file mode 100644
index 000..7bd4744
--- /dev/null
+++ b/content/base/test/bug15502_tab.html
@@ -0,0 +1,39 @@
+!DOCTYPE HTML
+html
+!--
+https://bugs.torproject.org/15502
+--
+head
+  meta http-equiv=content-type content=text/html; charset=utf-8
+  titleTab for Tor Browser Bug 15502/title
+  script type=text/javascript;version=1.7 src=bug15502_utils.js/script
+/head
+body
+
+div id=display/div
+iframe id=child width=100%/iframe
+
+script type=text/javascript;version=1.7
+
+let iframe = document.getElementById(child);
+
+let connect = function (sourceObject, destinationObject) {
+  Task.spawn(function* () {
+for (;;) {
+  let message = yield receiveMessage(sourceObject);
+  sendMessage(destinationObject, message);
+}
+  });
+};
+
+Task.spawn(function* () {
+  sendMessage(window.opener, ready);
+  let firstParentMessage = yield receiveMessage(window.opener);
+  iframe.src = firstParentMessage;
+  connect(window.opener, iframe.contentWindow);
+  connect(iframe.contentWindow, window.opener);
+});
+/script
+
+/body
+/html
diff --git a/content/base/test/bug15502_utils.js 
b/content/base/test/bug15502_utils.js
new file mode 100644
index 000..9d69c12
--- /dev/null
+++ b/content/base/test/bug15502_utils.js
@@ -0,0 +1,104 @@
+// Import Task.jsm
+let { Task } = SpecialPowers.Cu.import(resource://gre/modules/Task.jsm);
+
+// __listen(target, eventType, timeoutMs, useCapture)__.
+// Calls addEventListener on target, with the given eventType.
+// Returns a Promise that resolves to an Event object, if the event fires.
+// If a timeout occurs, then Promise is rejected with a Timed out error.
+// For use with Task.jsm.
+let listen = function (target, eventType, timeoutMs, useCapture) {
+  return new Promise(function (resolve, reject) {
+let listenFunction = function (event) {
+  target.removeEventListener(eventType, listenFunction, useCapture);
+  resolve(event);
+};
+target.addEventListener(eventType, listenFunction, useCapture);
+setTimeout(() = reject(new Error(Timed out)), timeoutMs);
+  });
+};
+
+//

[tor-commits] [tor-browser-bundle/master] Update changelog for bug 15502.

2015-04-21 Thread mikeperry 
commit 44c07072325b31478b06a874d700d518389932f4
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 19:46:08 2015 -0700

Update changelog for bug 15502.
---
 Bundle-Data/Docs/ChangeLog.txt |1 +
 1 file changed, 1 insertion(+)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index bbd4bd8..7e4b01c 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -22,6 +22,7 @@ Tor Browser 4.5 -- Apr 28 2015
* Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting
* Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism
* Bug 14716: Fix issues with HTTP Auth usage and TLS connection info display
+   * Bug 15502: Isolate blob URI scope to URL domain; block WebWorker access
* Bug 15562: Disable Javascript SharedWorkers due to third party tracking
* Bug 15757: Disable Mozilla video statistics API extensions
* Bug 15758: Disable Device Sensor APIs

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] Update versions files (alpha and stable) for 4.5.

2015-04-21 Thread mikeperry 
commit 750efb38def19147d1c363ceb8738920784f0b48
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 20:02:26 2015 -0700

Update versions files (alpha and stable) for 4.5.
---
 gitian/versions   |   29 +
 gitian/versions.alpha |   12 ++--
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/gitian/versions b/gitian/versions
index 3b74f27..653b4b1 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -4,19 +4,19 @@ BUILD_PT_BUNDLES=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=31.2.0esr
+FIREFOX_VERSION=31.6.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build3
-TOR_TAG=tor-0.2.5.10
-TORLAUNCHER_TAG=0.2.7.0.1
-TORBUTTON_TAG=1.7.0.1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2
+TOR_TAG=tor-0.2.6.7
+TORLAUNCHER_TAG=0.2.7.4
+TORBUTTON_TAG=1.9.2.0
 HTTPSE_TAG=5.0.2
-NSIS_TAG=v0.2
+NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable
-MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 # XXX: ???
+MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ???
 PYPTLIB_TAG=pyptlib-0.0.6
 OBFSPROXY_TAG=obfsproxy-0.2.12
 FLASHPROXY_TAG=1.6
@@ -27,13 +27,18 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # 
unsigned habnabit/1.13.0
 GOPTLIB_TAG=0.2
 MEEK_TAG=0.17
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
+GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
+GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
+GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300
+GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844
+OBFS4_TAG=obfs4proxy-0.0.5
 
 GITIAN_TAG=tor-browser-builder-3.x-7
 
-OPENSSL_VER=1.0.1i
+OPENSSL_VER=1.0.1m
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build1
+FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
 GCC_VER=4.9.1
 PYTHON_VER=2.7.5
@@ -52,7 +57,7 @@ GO_VER=1.4.2
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.3-sm+fn+fx.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.22-sm+fn+fx.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
@@ -74,12 +79,12 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz
 GO_PACKAGE=go${GO_VER}.src.tar.gz
 
 # Hashes for packages with weak sigs or no sigs
-OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7
+OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a
+NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 718019b..6419111 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -8,10 +8,10 @@ FIREFOX_VERSION=31.6.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1
-TOR_TAG=tor-0.2.6.6
-TORLAUNCHER_TAG=0.2.7.3
-TORBUTTON_TAG=1.9.1.0
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2
+TOR_TAG=tor-0.2.6.7
+TORLAUNCHER_TAG=0.2.7.4
+TORBUTTON_TAG=1.9.2.0
 HTTPSE_TAG=5.0.2
 NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
@@ -57,7 +57,7 @@ GO_VER=1.4.2
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.19-fx+fn+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.22-sm+fn+fx.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
@@ -84,7 +84,7 @@ 
GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=2579b91fb2f5491a12c49e543a9d2b2583dc82e2393ce1b0ab92b170dcc7c6ad
+NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8

[tor-commits] [tor-browser-bundle/master] List 4.5 in update-responses for alpha users.

2015-04-21 Thread mikeperry 
commit 4ac8af0dccc5e63fbfe44ca7deb98db019ba5a80
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Apr 21 20:02:49 2015 -0700

List 4.5 in update-responses for alpha users.
---
 tools/update-responses/config.yml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/update-responses/config.yml 
b/tools/update-responses/config.yml
index d06be81..1475195 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -9,14 +9,14 @@ build_targets:
 osx32: Darwin_x86-gcc3
 osx64: Darwin_x86_64-gcc3
 channels:
-alpha: 4.5a5
+alpha: 4.5
 versions:
-4.5a5:
+4.5:
 platformVersion: 31.6.0
 detailsURL: https://www.torproject.org/projects/torbrowser.html.en
-download_url: https://www.torproject.org/dist/torbrowser/4.5a5
+download_url: https://www.torproject.org/dist/torbrowser/4.5
 incremental_from:
-  - 4.5a4
+  - 4.5a5
 migrate_archs:
   osx32: osx64
 osx32:

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-bundle/master] fixup! Bug 15689: Switch back to HTTPS-E git repository

2015-04-21 Thread gk 
commit c5e0b0b7517e5e1e2dfe23506db2d9b7b0939ef1
Author: Georg Koppen g...@torproject.org
Date:   Tue Apr 21 11:29:28 2015 +

fixup! Bug 15689: Switch back to HTTPS-E git repository

Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
---
 gitian/descriptors/linux/gitian-bundle.yml   |2 ++
 gitian/descriptors/mac/gitian-bundle.yml |2 ++
 gitian/descriptors/windows/gitian-bundle.yml |2 ++
 3 files changed, 6 insertions(+)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml 
b/gitian/descriptors/linux/gitian-bundle.yml
index f5ad824..455fc89 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -101,6 +101,8 @@ script: |
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
   rm -f .git/refs/heads/master
   ./makexpi.sh
+  # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
+  rm ./pkg/*-amo.xpi
   cp pkg/*.xpi 
../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
   cd ..
   #
diff --git a/gitian/descriptors/mac/gitian-bundle.yml 
b/gitian/descriptors/mac/gitian-bundle.yml
index 7945f5e..61a024b 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -109,6 +109,8 @@ script: |
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
   rm -f .git/refs/heads/master
   ./makexpi.sh
+  # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
+  rm ./pkg/*-amo.xpi
   cp pkg/*.xpi 
../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
   cd ..
   #
diff --git a/gitian/descriptors/windows/gitian-bundle.yml 
b/gitian/descriptors/windows/gitian-bundle.yml
index d089e0d..92b9382 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -88,6 +88,8 @@ script: |
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
   rm -f .git/refs/heads/master
   ./makexpi.sh
+  # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
+  rm ./pkg/*-amo.xpi
   cp ./pkg/*.xpi ../tbb-windows-installer/Tor 
Browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
   cd ..
   #

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits