summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-07-06 15:06:40 +0000
committerintrigeri <intrigeri@boum.org>2017-07-06 15:06:40 +0000
commit4e736f190a69e5f5bc59bdb2fa41c3be9fdccb1d (patch)
tree197961f6073a55ca0b9beed22762ede045afda4e
parent76f75565423bd8c2b4b1936716e6255fedf629c0 (diff)
parentd72f58b3a6af8b17b24180d8035b9254836813df (diff)
Merge remote-tracking branch 'origin/master' into stable
m---------submodules/pythonlib0
-rw-r--r--wiki/src/blueprint/monthly_report/report_2017_06.mdwn14
-rw-r--r--wiki/src/install/v1/Tails/i386/stable/latest.yml6
3 files changed, 12 insertions, 8 deletions
diff --git a/submodules/pythonlib b/submodules/pythonlib
-Subproject 9906322f76c0f323bc99090905c31add47cacce
+Subproject d5f35ffa842b26f9331f31324faf66911a55c1a
diff --git a/wiki/src/blueprint/monthly_report/report_2017_06.mdwn b/wiki/src/blueprint/monthly_report/report_2017_06.mdwn
index 8f1f5c6..f663211 100644
--- a/wiki/src/blueprint/monthly_report/report_2017_06.mdwn
+++ b/wiki/src/blueprint/monthly_report/report_2017_06.mdwn
@@ -63,17 +63,17 @@ verification options for our users
User experience
===============
-- We discussed strategies to [[porting our Download and Verify extension
+- We discussed strategies to [porting our Download and Verify extension
for Firefox to *Web
- Extensions*|https://mailman.boum.org/pipermail/tails-ux/2017-June/003394.html]],
+ Extensions*](https://mailman.boum.org/pipermail/tails-ux/2017-June/003394.html),
a requirement for the upcoming Firefox 57 (November 14), as this will
affect the design of our download instructions.
- We finished the redesign of *Tails Installer* to get rid of the
- initial splash screen. ([[!tails_ticket 8859]]).
+ initial splash screen. ([[!tails_ticket 8859]])
-- We installed a [[prototype of
- *Piwik*|https://mailman.boum.org/pipermail/tails-ux/2017-June/003398.html]],
+- We installed a [prototype of
+ *Piwik*](https://mailman.boum.org/pipermail/tails-ux/2017-June/003398.html),
a free web analytics platform, to evaluate how well it would work
against our privacy constraints and metrics needs.
@@ -160,6 +160,10 @@ Upcoming events
[DebConf17](https://debconf17.debconf.org/), the annual conference
for Debian contributors and users interested in improving Debian.
+* A Tails contributor proposed a talk about Tails for the
+ [BalCCon2k17](https://2k17.balccon.org/index.php?title=BalCCon2k17)
+ (Balkan Computer Congress).
+
On-going discussions
====================
diff --git a/wiki/src/install/v1/Tails/i386/stable/latest.yml b/wiki/src/install/v1/Tails/i386/stable/latest.yml
index c0c1f74..a0de847 100644
--- a/wiki/src/install/v1/Tails/i386/stable/latest.yml
+++ b/wiki/src/install/v1/Tails/i386/stable/latest.yml
@@ -2,8 +2,8 @@
build-target: amd64
channel: stable
product-name: Tails
-version: '3.0'
+version: '3.0.1'
target-files:
-- sha256: 676f1322166536dc1e27b8db22462ae73f0891888cfcb09033ebc38f586e834a
+- sha256: 5805604801bb7e49627168b3a02fefc5857209a30b8e2c04936c481ed2d08a57
size: 1209116672
- url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.0/tails-amd64-3.0.iso
+ url: http://dl.amnesia.boum.org/tails/stable/tails-amd64-3.0.1/tails-amd64-3.0.1.iso