Merge branch 'stable'

Conflicts:
	wiki/src/support/known_issues.fr.po

auto/config

@@ -35,7 +35,7 @@ $RUN_LB_CONFIG \
    --memtest none \
    --packages-lists="standard" \
    --tasks="standard" \
-   --linux-packages="linux-image-3.12-1" \
+   --linux-packages="linux-image-3.14-1" \
    --syslinux-menu vesamenu \
    --syslinux-splash data/splash.png \
    --syslinux-timeout 4 \

config/chroot_apt/preferences

@@ -63,6 +63,10 @@ Package: libgnupg-interface-perl
 Pin: origin backports.debian.org
 Pin-Priority: 999
 
+Package: libgnutls26
+Pin: release o=Debian,n=squeeze-lts
+Pin-Priority: 999
+
 Package: libgtk2-perl
 Pin: origin backports.debian.org
 Pin-Priority: 999
@@ -171,6 +175,10 @@ Package: msva-perl
 Pin: origin backports.debian.org
 Pin-Priority: 999
 
+Package: openssl libssl0.9.8
+Pin: release o=Debian,n=squeeze-lts
+Pin-Priority: 999
+
 Package: pidgin
 Pin: origin backports.debian.org
 Pin-Priority: 999
@@ -268,7 +276,43 @@ Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
 Package: linux-base
-Pin: release o=Debian,a=testing
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-compiler-gcc-4.8-x86
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-3.14-1-common
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-3.14-1-486
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-3.14-1-686-pae
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-headers-3.14-1-amd64
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-image-3.14-1-486
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-image-3.14-1-686-pae
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-image-3.14-1-amd64
+Pin: release o=Debian,a=unstable
+Pin-Priority: 999
+
+Package: linux-kbuild-3.14
+Pin: release o=Debian,a=unstable
 Pin-Priority: 999
 
 Package: laptop-mode-tools
@@ -372,6 +416,10 @@ Package: *
 Pin: release o=Debian,n=squeeze
 Pin-Priority: 900
 
+Package: *
+Pin: release o=Debian,n=squeeze-lts
+Pin-Priority: -1
+
 Package: *
 Pin: origin backports.debian.org
 Pin-Priority: 200

config/chroot_local-includes/etc/iceweasel/pref/000-tor-browser.js

@@ -49,6 +49,7 @@ pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmar
 pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers
 pref("services.sync.engine.addons", false);
 pref("services.sync.engine.tabs", false);
+pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/
 
 // Fingerprinting
 pref("webgl.min_capability_mode", true);
@@ -140,5 +141,20 @@ pref("keyword.URL", "https://startpage.com/do/search?q=");
 pref("gfx.direct2d.disabled", true);
 pref("layers.acceleration.disabled", true);
 
+// Security enhancements
+// https://trac.torproject.org/projects/tor/ticket/9387#comment:17
+pref("javascript.options.ion.content", false);
+pref("javascript.options.baselinejit.content", false);
+pref("javascript.options.asmjs", false);
+pref("javascript.options.typeinference", false);
+
+// Audio_data is deprecated in future releases, but still present
+// in FF24. This is a dangerous combination (spotted by iSec)
+pref("media.audio_data.enabled", false);
+
+// Enable TLS 1.1 and 1.2:
+// https://trac.torproject.org/projects/tor/ticket/11253
+pref("security.tls.version.max", 3);
+
 // Version placeholder
 pref("torbrowser.version", "UNKNOWN");

config/chroot_sources/squeeze-lts.binary

+squeeze-lts.chroot
\ No newline at end of file

config/chroot_sources/squeeze-lts.chroot

+deb http://ftp.us.debian.org/debian/ squeeze-lts main contrib non-free

debian/changelog

+tails (1.0.1) unstable; urgency=medium
+
+  * Security fixes
+    - Upgrade the web browser to 24.6.0esr-0+tails1~bpo60+1
+      (Firefox 24.6.0esr + Iceweasel patches + Torbrowser patches).
+      Also import the Tor Browser profile at commit
+      90ba8fbaf6f23494f1a0e38d63153b3b7e65d3d3 from
+      ttp/tor-browser-24.6.0esr-3.x-1.
+    - Install Linux 3.14 from Debian unstable (fixes CVE-2014-3153 and
+      others).
+    - Install openssl from Squeeze LTS (fixes CVE-2014-0076,
+      CVE-2014-0195, CVE-2014-0221, CVE-2014-3470 and CVE-2014-0224).
+    - Install GnuTLS from Squeeze LTS (fixes CVE-2014-3466.).
+
+  * Minor improvements
+    - Add Squeeze LTS APT sources. It has been given a low pinning
+      priority so explicit pinning must be used to actually install
+      anything from it.
+    - Upgrade Tor to 0.2.4.22-1~d60.squeeze+1.
+    - Upgrade I2P to 0.9.13-1~deb6u+1.
+
+ -- Tails developers <tails@boum.org>  Sun, 08 Jun 2014 19:14:00 +0200
+
 tails (1.0) unstable; urgency=medium
 
   * Security fixes

features/domains/default.xml

@@ -53,7 +53,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
     <video>
-      <model type='cirrus' vram='9216' heads='1'/>
+      <model type='qxl' vram='9216' heads='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>

po/ar.po

@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-27 19:29+0200\n"
-"PO-Revision-Date: 2014-04-04 08:51+0000\n"
+"POT-Creation-Date: 2014-06-08 19:08+0200\n"
+"PO-Revision-Date: 2014-04-30 09:10+0000\n"
 "Last-Translator: runasand <runa.sandvik@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/"
 "language/ar/)\n"
@@ -259,9 +259,8 @@ msgid "Reboot Immediately"
 msgstr "إعادة التشغيل في الحال"
 
 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72
-#, fuzzy
 msgid "Shutdown Helper"
-msgstr "إيقاف التشغيل في الحال"
+msgstr "مساعد إيقاف التشغيل"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:16
 msgid "not available"

po/cy.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-27 19:29+0200\n"
-"PO-Revision-Date: 2014-04-04 08:50+0000\n"
+"POT-Creation-Date: 2014-06-08 19:08+0200\n"
+"PO-Revision-Date: 2014-04-30 09:10+0000\n"
 "Last-Translator: runasand <runa.sandvik@gmail.com>\n"
 "Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/"
 "language/cy/)\n"
@@ -250,9 +250,8 @@ msgid "Reboot Immediately"
 msgstr "Ailgychwynwch ar unwaith"
 
 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72
-#, fuzzy
 msgid "Shutdown Helper"
-msgstr "Cau lawr ar unwaith"
+msgstr "Cynorthwydd cau lawr"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:16
 msgid "not available"

po/da.po

@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-27 19:29+0200\n"
-"PO-Revision-Date: 2014-04-08 18:10+0000\n"
-"Last-Translator: DavidNielsen <gnomeuser@gmail.com>\n"
+"POT-Creation-Date: 2014-06-08 19:08+0200\n"
+"PO-Revision-Date: 2014-04-30 09:10+0000\n"
+"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/"
 "language/da/)\n"
 "Language: da\n"
@@ -247,9 +247,8 @@ msgid "Reboot Immediately"
 msgstr "Genstart med det samme"
 
 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72
-#, fuzzy
 msgid "Shutdown Helper"
-msgstr "Luk ned med det samme"
+msgstr "Slukkehjælper"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:16
 msgid "not available"

po/de.po

@@ -4,6 +4,7 @@
 #
 # Translators:
 # redplanet, 2014
+# trantor <clucko3@gmail.com>, 2014
 # ivl1705 <listmember@rinnberger.de>, 2013
 # skps <lmaerz@emailn.de>, 2013
 # MarioBaier26 <mario.baier26@gmx.de>, 2013
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-27 19:29+0200\n"
-"PO-Revision-Date: 2014-04-04 08:50+0000\n"
-"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
+"POT-Creation-Date: 2014-06-08 19:08+0200\n"
+"PO-Revision-Date: 2014-05-29 21:01+0000\n"
+"Last-Translator: trantor <clucko3@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/torproject/"
 "language/de/)\n"
 "Language: de\n"
@@ -597,3 +598,6 @@ msgstr "Unsicherer Internet-Browser"
 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
 msgid "Tails specific tools"
 msgstr "Tails spezifische Werkzeuge"
+
+#~ msgid "Learn more about Tails"
+#~ msgstr "Mehr über Tails erfahren"

po/el.po

@@ -5,15 +5,16 @@
 # Translators:
 # pappasadrian <pappasadrian@gmail.com>, 2013
 # Alex <hestia@riseup.net>, 2013
+# andromeas <andromeas@hotmail.com>, 2014
 # firespin <dartworldgr@hotmail.com>, 2014
 # kotkotkot <kotakota@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-27 19:29+0200\n"
-"PO-Revision-Date: 2014-04-08 00:20+0000\n"
-"Last-Translator: firespin <dartworldgr@hotmail.com>\n"
+"POT-Creation-Date: 2014-06-08 19:08+0200\n"
+"PO-Revision-Date: 2014-06-02 00:20+0000\n"
+"Last-Translator: andromeas <andromeas@hotmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/"
 "language/el/)\n"
 "Language: el\n"
@@ -597,3 +598,6 @@ msgstr "Μη ασφαλής Browser"
 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
 msgid "Tails specific tools"
 msgstr "Εργαλεία ειδικά για το Tails"
+
+#~ msgid "Learn more about Tails"
+#~ msgstr "Μάθετε περισσότερα σχετικά με Tails"

po/es.po

@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-27 19:29+0200\n"
-"PO-Revision-Date: 2014-04-04 08:51+0000\n"
-"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
+"POT-Creation-Date: 2014-06-08 19:08+0200\n"
+"PO-Revision-Date: 2014-05-29 15:18+0000\n"
+"Last-Translator: strel\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/"
 "language/es/)\n"
 "Language: es\n"
@@ -593,3 +593,6 @@ msgstr "Navegador No Seguro"
 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
 msgid "Tails specific tools"
 msgstr "Herramientas específicas de Tails"
+
+#~ msgid "Learn more about Tails"
+#~ msgstr "Aprenda más acerca de Tails"

po/fa.po

@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-27 19:29+0200\n"
-"PO-Revision-Date: 2014-04-04 08:51+0000\n"
+"POT-Creation-Date: 2014-06-08 19:08+0200\n"
+"PO-Revision-Date: 2014-04-30 09:10+0000\n"
 "Last-Translator: runasand <runa.sandvik@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/"
 "language/fa/)\n"
@@ -243,9 +243,8 @@ msgid "Reboot Immediately"
 msgstr "فوراً راه اندازی مجدد کن"
 
 #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72
-#, fuzzy
 msgid "Shutdown Helper"
-msgstr "فوراً خاموش کن"
+msgstr "کمک‌یار خاموش کردن"
 
 #: config/chroot_local-includes/usr/local/bin/tails-about:16
 msgid "not available"

po/fr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-27 19:29+0200\n"
+"POT-Creation-Date: 2014-06-08 19:08+0200\n"
 "PO-Revision-Date: 2014-03-17 12:00+0100\n"
 "Last-Translator: amnesia <amnesia@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

po/fr_CA.po

@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-27 19:29+0200\n"
-"PO-Revision-Date: 2014-04-04 08:51+0000\n"
-"Last-Translator: runasand <runa.sandvik@gmail.com>\n"
+"POT-Creation-Date: 2014-06-08 19:08+0200\n"
+"PO-Revision-Date: 2014-05-29 15:20+0000\n"
+"Last-Translator: Alain-Olivier  Breysse\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/"
 "torproject/language/fr_CA/)\n"
 "Language: fr_CA\n"
@@ -55,7 +55,7 @@ msgstr ""
 "<p>Si cela ne vous dérange pas de divulguer quelque peu \n"
 "votre identité aux développeurs de Tails, vous pouvez nous \n"
 "fournir une adresse courriel pour nous permettre de demander\n"
-"plus de détails sur le bogue. De plus, saisir une clé PGP publique\n"
+"plus de détails sur le bogue. De plus, saisir une clef PGP publique\n"
 "nous permet de chiffrer de telles communications futures.</p>\n"
 "<p>N'importe qui pouvant voir cette réponse pourra probablement\n"
 "déduire que vous êtes un utilisateur de Tails. C'est le moment de\n"
@@ -594,3 +594,6 @@ msgstr "Navigateur Web non-sécurisé"
 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:2
 msgid "Tails specific tools"
 msgstr "Outils spécifiques à Tails"
+
+#~ msgid "Learn more about Tails"
+#~ msgstr "En apprendre plus à propos de Tails"