Merge remote-tracking branch 'origin/master'

config/chroot_apt/preferences

@@ -134,10 +134,18 @@ Package: linux-kbuild-3.16
 Pin: release o=Debian,n=jessie
 Pin-Priority: 999
 
+Package: monkeysphere
+Pin: release o=Debian,n=stretch
+Pin-Priority: 999
+
 Package: obfs4proxy
 Pin: release o=TorProject,n=obfs4proxy
 Pin-Priority: 990
 
+Package: pinentry-gtk2
+Pin: release o=Debian Backports,n=jessie-backports
+Pin-Priority: 999
+
 Package: python-electrum
 Pin: release o=Debian,n=stretch
 Pin-Priority: 999

config/chroot_local-hooks/59-libdvd-pkg

@@ -36,7 +36,7 @@ EOF
     equivs-build "libdvd-pkg-${LIBDVD_PKG_VERSION}.control"
     dpkg -i "libdvd-pkg_${LIBDVD_PKG_VERSION}_all.deb"
 )
-rm -R "${tmp}"
+rm -r "${tmp}" /usr/src/libdvd-pkg
 
 # Remove dangling symlink -- note that we absolutely do not want the
 # functionality (automatic checks and upgrades for new css sources)

config/chroot_local-includes/etc/skel/.gnupg/gpg-agent.conf

+no-grab

config/chroot_local-includes/lib/systemd/system-shutdown/tails-kexec

@@ -35,6 +35,16 @@ print_text "--------------------------------------------------------------------
 
 # Note to translators: any text line must fit on a 80 characters wide screen
 case "${LANG}" in
+   de_DE.UTF-8)
+      print_text "        Sie können nun die Start-DVD oder den Start-USB-Stick entfernen"
+      print_empty_line
+      print_text "            Der Systemspeicher wird in einigen Sekunden gelöscht..."
+      print_empty_line
+      print_text "               Die Anzeige könnte anschließend fehlerhaft sein."
+      print_empty_line
+      print_text "      Falls sich das System in einigen Sekunden nicht selbst ausschaltet,"
+      print_text "         bedeutet dies, dass die Speicherlöschung fehlgeschlagen ist."
+      ;;
    es_ES.UTF-8)
       print_text "              Puede ahora retirar el DVD o el USB de arranque."
       print_empty_line

config/chroot_local-includes/usr/local/bin/icedove

@@ -16,10 +16,17 @@ claws_mail_config_is_persistent() {
 }
 
 warn_about_claws_mail_persistence() {
+
     local dialog_msg="<b><big>`gettext \"The <b>Claws Mail</b> persistence feature is activated.\"`</big></b>
 
 `gettext \"If you have emails saved in <b>Claws Mail</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your data</a> before starting <b>Icedove</b>.\"`"
 
+    if [ -f "${PROFILE}/prefs.js" ]; then
+        dialog_msg="${dialog_msg}
+
+`gettext \"If you already migrated your emails to <b>Icedove</b>, you should <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to remove this warning.\"`"
+    fi
+
     local launch="`gettext \"_Launch\"`"
     local exit="`gettext \"_Exit\"`"
     # Since zenity can't set the default button to cancel, we switch the

config/chroot_local-includes/usr/share/icons/hicolor/scalable/status/tor-disconnected-symbolic.svg

@@ -189,8 +189,8 @@
      inkscape:connector-curvature="0" />
   <path
      inkscape:connector-curvature="0"
-     d="m 10.903841,10.777345 1.375,0 1.125,1.09375 1.09375,-1.09375 1.40625,0 0,1.46875 -1.09375,1.0625 1.09375,1.0625 0,1.40625 -1.4375,0 -1.0625,-1.0625 -1.0625,1.0625 -1.4375,0 0,-1.40625 1.0625,-1.0625 -1.0625,-1.0625 0,-1.46875 z"
+     d="m 7.6648686,7.5383726 2.2657181,0 1.8537683,1.8022747 1.802276,-1.8022747 2.31721,0 0,2.4201983 -1.802276,1.7507821 1.802276,1.750782 0,2.31721 -2.368704,0 -1.750782,-1.750782 -1.750782,1.750782 -2.3687044,0 0,-2.31721 1.7507821,-1.750782 -1.7507821,-1.7507821 0,-2.4201983 z"
      id="path3761-2-3-5-4-8-9-8-0-1-7-8-8"
      sodipodi:nodetypes="ccccccccccccccccc"
-     style="color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible" />
+     style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#333333;fill-opacity:1;stroke:none;stroke-width:2;marker:none" />
 </svg>

config/chroot_local-includes/usr/share/tails/tbb-dist-url.txt

-http://torbrowser-archive.tails.boum.org/5.5.4/
+http://torbrowser-archive.tails.boum.org/5.5.5/

config/chroot_local-includes/usr/share/tails/tbb-sha256sums.txt

-c0230f9515594f1dbad1ef778187597819f9d12e697285957df187d69a1df570  tor-browser-linux32-5.5.4_ar.tar.xz
-8780fc5ee642143af56e359885a3f7914b5fa824222a5d28d350be14029b7d2b  tor-browser-linux32-5.5.4_de.tar.xz
-ebc24ad69a27531dac62c25f939d4028c5494c1759137a3a841e9e32619a3c71  tor-browser-linux32-5.5.4_en-US.tar.xz
-a9094a133d24b1d1d32646fd87a2b3812ada698d8e285297ee58a8b284eceaae  tor-browser-linux32-5.5.4_es-ES.tar.xz
-6ddee25cb5ad338bc4cf2f126c3b330b800923f4631f9f2572a4a921e571ecd6  tor-browser-linux32-5.5.4_fa.tar.xz
-634360f7f166d48a0e0aed46a40c2e88c7b3d46e45f5106c19f9f48d99193901  tor-browser-linux32-5.5.4_fr.tar.xz
-c74ed2611dbd855985325543c549e6733c1b9c39e2de5c702838b9d967e69cf3  tor-browser-linux32-5.5.4_it.tar.xz
-57677ad0580fc119cc0d42a0e48e2a1fb67875a09b3d4927b2d04174a1d27fc5  tor-browser-linux32-5.5.4_ja.tar.xz
-e23c0e1e06d6305fcc778549674da94778a8bb122350c8076a1dbcab3e8e3502  tor-browser-linux32-5.5.4_ko.tar.xz
-1c307b7ff82292339c3420ddd992e758dc01a0bc5b11672da5e3dfb3de010795  tor-browser-linux32-5.5.4_nl.tar.xz
-c147082b200e7ea5cdf1746396b63c8c3a4259d8b12e93c2ff704ac3e53ed696  tor-browser-linux32-5.5.4_pl.tar.xz
-cdb7f0feebc82a8602ca90a27a00d1a814cd779a1cdb34d106f83d99a6977692  tor-browser-linux32-5.5.4_pt-PT.tar.xz
-7a4e60cd52a26a200398cbd1701a64c8f82e401523ded4d58d1ff8d5dd6e3a8b  tor-browser-linux32-5.5.4_ru.tar.xz
-f39403c24185b88908390fc8f0085673cb4729db08f903e59ce9840b0c6667ee  tor-browser-linux32-5.5.4_tr.tar.xz
-03f6f51ced8c33e0837af7de0eaf2e2006986f8f9cbffc549ec97ed15727a1a9  tor-browser-linux32-5.5.4_vi.tar.xz
-7da9593784326243429cbdecac218359849b5275b2bd7799c7cc534b4972cd25  tor-browser-linux32-5.5.4_zh-CN.tar.xz
+e08f0ca1136895666146ffa1057ec049424b0815e529440804f8f8893a72f17c  tor-browser-linux32-5.5.5_ar.tar.xz
+fbb288479a89d519934c64b34f356bbd9c5b56b23e9c223411af6a884064b5b3  tor-browser-linux32-5.5.5_de.tar.xz
+ea4f4ba44b2d9eda3e2879cf8580ed6fc69fff6c8ab7fa50f4e528de6d95b812  tor-browser-linux32-5.5.5_en-US.tar.xz
+08a0f228aaa24439b0eddddadf3a98eb30ad4360c2dd29c1f119bad2fd10c2f1  tor-browser-linux32-5.5.5_es-ES.tar.xz
+0926754250a257695ac63dd6038bec5e980d3eddf71ca0e01099ed3e431a4c99  tor-browser-linux32-5.5.5_fa.tar.xz
+a5d4f70bc81a8e8737c1730f56253a0ce09f7b5b1b0de8297098b166a478ac96  tor-browser-linux32-5.5.5_fr.tar.xz
+a151ded0d05dc4cc1d2a2814aee7305d039c4ea5b6e6faa83f695b926c9f3ca9  tor-browser-linux32-5.5.5_it.tar.xz
+5522df3fcdd903e374936061595a877ca64cd9a51f9ed25a32fa411a904ccee9  tor-browser-linux32-5.5.5_ja.tar.xz
+05b52308c46a845fdeac5619cf37e066d9be0075d802f73a9ddbc5d6e55c8e91  tor-browser-linux32-5.5.5_ko.tar.xz
+15eebdea32ecbfe7f28c9320cf0cb6f6a5afb3052948533c3b4b2632d08bc06a  tor-browser-linux32-5.5.5_nl.tar.xz
+b91b44470c789bbcbae1dfa732cb98c70757a19922da98d14aa7b4b76866af2f  tor-browser-linux32-5.5.5_pl.tar.xz
+35f97514baeeaf0f2c20b4796a521d94c27a636dec28e8d9e59b3a1118165157  tor-browser-linux32-5.5.5_pt-PT.tar.xz
+c52380acac9bb0c3e6f593d2fc88abeeac334204aac272bb34641fd7d8f4323e  tor-browser-linux32-5.5.5_ru.tar.xz
+7e9c0ea073429402bcd93d276028310110884e1344444af3783255a3c1dbb3e8  tor-browser-linux32-5.5.5_tr.tar.xz
+e15a4c85d7afcd907b7f594a4fb3d72b4c99710d9aa86aef08db9ca7c8ee44bb  tor-browser-linux32-5.5.5_vi.tar.xz
+d8cb7b650c51a35a67ca0356d9bcfbe16814b7fafb5efa2148ec01b2b1301fde  tor-browser-linux32-5.5.5_zh-CN.tar.xz

debian/changelog

+tails (2.3) unstable; urgency=medium
+
+  * Security fixes
+    - Upgrade Tor Browser to 5.5.5. (Fixes: #11362)
+    - Upgrade icedove to 38.7.0-1~deb8u1
+    - Upgrade git to 1:2.1.4-2.1+deb8u2
+    - Upgrade libgd3 to 2.1.0-5+deb8u1
+    - Upgrade pidgin-otr to 4.0.1-1+deb8u1
+    - Upgrade srtp to 1.4.5~20130609~dfsg-1.1+deb8u1
+    - Upgrade imagemagick to 8:6.8.9.9-5+deb8u1
+    - Upgrade samba to 2:4.2.10+dfsg-0+deb8u2
+    - Upgrade openssh to 1:6.7p1-5+deb8u2
+
+  * Bugfixes
+    - Refresh Tor Browser's AppArmor profile patch against the one from
+      torbrowser-launcher 0.2.4-1. (Fixes: #11264)
+    - Pull monkeysphere from stretch to avoid failing to install under
+      eatmydata. (Fixes: #11170)
+    - Start gpg-agent with no-grab option due to issues with pinentry and
+      GNOME's top bar. (Fixes: #11038)
+    - Tails Installer: Update error message to match new name of 'Clone
+      & Install'. (Fixes: #11238)
+    - Onion Circuits:
+      * Cope with a missing geoipdb. (Fixes: #11203)
+      * Make both panes of the window scrollable. (Fixes #11192)
+    - WhisperBack: Workaround socks bug. When the Tor fails to connect to
+      the host, WisperBack used to display a ValueError.  This is caused by
+      a socks bug that is solved in upstream's master but not in Tails.
+      This commit workarounds this bug Unclear error message in WhisperBack
+      when failing to connect to the server. (Fixes: #11136)
+
+  * Minor improvements
+    - Upgrade to Debian 8.4, a Debian point release with many minor upgrades
+      and fixes to various packages . (Fixes: #11232)
+    - Upgrade I2P to 0.9.25. (Fixes: #11363)
+    - Pin pinentry-gtk2 to jessie-backports. The new version allows pasting
+      passwords from the clipboard. (Fixes: #11239)
+    - config/chroot_local-hooks/59-libdvd-pkg: cleanup /usr/src/libdvd-pkg.
+      (Fixes: #11273)
+    - Make the Tor Status "disconnected" icon more contrasted with the
+      "connected" one. (Fixes: #11199)
+
+  * Test suite
+    - Add UTF-8 support to OTR Bot. (Fixes: #10866)
+    - Don't explicitly depend on openjdk-7-jre or any JRE for that
+      matter. Sikuli will pull in a suitable one, so depending on one
+      ourselves is only risks causing trouble. (Fixes: #11335)
+
+ -- Tails developers <tails@boum.org>  Mon, 25 Apr 2016 14:12:22 +0200
+
 tails (2.2.1) unstable; urgency=medium
 
   * Security fixes

features/scripts/otr-bot.py

@@ -102,8 +102,8 @@ class OtrBot(jabberbot.JabberBot):
     # Wrap OTR encryption around Jabberbot's most low-level method for
     # sending messages.
     def send_message(self, mess):
-        body = str(mess.getBody())
-        user = str(mess.getTo().getStripped())
+        body = mess.getBody().encode('utf-8')
+        user = mess.getTo().getStripped().encode('utf-8')
         otrctx = self.__otr_manager.get_context_for_user(user)
         if otrctx.state == potr.context.STATE_ENCRYPTED:
             otrctx.sendMessage(potr.context.FRAGMENT_SEND_ALL, body,
@@ -113,8 +113,8 @@ class OtrBot(jabberbot.JabberBot):
 
     # Wrap OTR decryption around Jabberbot's callback mechanism.
     def callback_message(self, conn, mess):
-        body = str(mess.getBody())
-        user = str(mess.getFrom().getStripped())
+        body = mess.getBody().encode('utf-8')
+        user = mess.getFrom().getStripped().encode('utf-8')
         otrctx = self.__otr_manager.get_context_for_user(user)
         if mess.getType() == "chat":
             try:
@@ -172,7 +172,7 @@ class OtrBot(jabberbot.JabberBot):
         """Make me gracefully end the OTR session if there is one"""
         if mess.getType() == "groupchat":
             return
-        user = str(mess.getFrom().getStripped())
+        user = mess.getFrom().getStripped().encode('utf-8')
         self.__otr_manager.get_context_for_user(user).disconnect(appdata =
             self.__otr_appdata_for_mess(mess.buildReply()))
         return ""

features/step_definitions/electrum.rb

@@ -23,7 +23,8 @@ When /^I create a new bitcoin wallet$/ do
   @screen.type('c', Sikuli::KeyModifier.CTRL) # copy seed to clipboard
   seed = $vm.get_clipboard
   @screen.wait_and_click("ElectrumNextButton.png", 15)
-  @screen.wait("ElectrumWalletSeedTextbox.png", 15)
+  @screen.wait("ElectrumSeedVerificationPrompt.png", 15)
+  @screen.click("ElectrumWalletSeedTextbox.png", 15)
   @screen.type(seed) # Confirm seed
   @screen.wait_and_click("ElectrumNextButton.png", 10)
   @screen.wait_and_click("ElectrumEncryptWallet.png", 10)

import-translations

@@ -31,6 +31,9 @@ elif [ -f 'po/tails-greeter.pot' ]; then
 elif [ -f 'po/tails-iuk.pot' ]; then
 	BRANCH='tails-iuk_completed'
 	AFTER_IMPORT='make -C po pot && make -C po update-po'
+elif [ -f 'po/onioncircuits.pot' ]; then
+	BRANCH='tails-onioncircuits_completed'
+	AFTER_IMPORT='./setup.py build_i18n && ( cd po && for po in *.po ; do msgmerge --update "$po" onioncircuits.pot ; done )'
 elif [ -f 'po/tails-perl5lib.pot' ]; then
 	BRANCH='tails-perl5lib_completed'
 	AFTER_IMPORT='make -C po pot && make -C po update-po'

po/ar.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-17 15:03+0100\n"
+"POT-Creation-Date: 2016-04-25 14:02+0200\n"
 "PO-Revision-Date: 2014-12-05 17:21+0000\n"
 "Last-Translator: Osama M. Mneina <o.mneina@gmail.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/"
@@ -83,13 +83,13 @@ msgid "Do you want to start Electrum anyway?"
 msgstr ""
 
 #: config/chroot_local-includes/usr/local/bin/electrum:23
-#: config/chroot_local-includes/usr/local/bin/icedove:23
+#: config/chroot_local-includes/usr/local/bin/icedove:30
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Launch"
 
 #: config/chroot_local-includes/usr/local/bin/electrum:24
-#: config/chroot_local-includes/usr/local/bin/icedove:24
+#: config/chroot_local-includes/usr/local/bin/icedove:31
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Exit"
@@ -269,17 +269,25 @@ msgstr "مخرجات GnuPG:"
 msgid "Other messages provided by GnuPG:"
 msgstr "رسائل أخرى من GnuPG:"
 
-#: config/chroot_local-includes/usr/local/bin/icedove:19
+#: config/chroot_local-includes/usr/local/bin/icedove:20
 msgid "The <b>Claws Mail</b> persistence feature is activated."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/icedove:21
+#: config/chroot_local-includes/usr/local/bin/icedove:22
 msgid ""
 "If you have emails saved in <b>Claws Mail</b>, you should <a href='https://"
 "tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate your "
 "data</a> before starting <b>Icedove</b>."
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/icedove:27
+msgid ""
+"If you already migrated your emails to <b>Icedove</b>, you should <a "
+"href='https://tails.boum.org/doc/anonymous_internet/"
+"claws_mail_to_icedove#delete'>delete all your <b>Claws Mail</b> data</a> to "
+"remove this warning."
+msgstr ""
+
 #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71
 msgid "Restart"
 msgstr ""