Merge branch 'master' into stable

Rakefile

@@ -647,7 +647,7 @@ namespace :basebox do
     boxes.sort! { |a, b| basebox_date(a) <=> basebox_date(b) }
     boxes.pop
     boxes.each do |box|
-      if basebox_date(box) < Date.today - 365.0/3.0
+      if basebox_date(box) < Date.today - 365.0/2.0
         clean_up_basebox(box)
       end
     end

wiki/src/blueprint/monthly_report/report_2018_06.mdwn

@@ -27,6 +27,26 @@ XXX: If you feel like it and developers don't do it themselves,
      Release section (for example, the changes being worked on for
      the next version).
 
+- We have worked on improving support for recent graphics cards and in
+  particular those produced by NVIDIA. We've sent
+  a [call for testing](https://mailman.boum.org/pipermail/tails-testers/2018-June/001018.html)
+  and
+  [updated](https://mailman.boum.org/pipermail/tails-testers/2018-June/001029.html)
+  it. If the feedback is good, we will probably include these changes
+  in Tails 3.9.
+
+- We have kept working on fixing the EFAIL attacks against
+  encrypted email ([[!tails_ticket 15602]]). Tails 3.8 fixed most of
+  them and Tails 3.9 should fix the remaining ones.
+
+- We have worked on detecting earlier changes that would break
+  automatic upgrades ([[!tails_ticket 15419]])… and already identified
+  one we need to fix in time for Tails 3.9 ([[!tails_ticket 15695]]).
+
+- Chris Lamb prepared a fix for the most infamous rendering issue (raw PO
+  content being inserted in some page) that affects our website
+  ([[!tails_ticket 6907]]).
+
 Documentation and website
 =========================
 

wiki/src/contribute/calendar.mdwn

@@ -2,13 +2,11 @@
 
 All times are referenced to Berlin and Paris time.
 
-## 2018Q2
-
-* 2018-06-01: Beta release of VeraCrypt
+## 2018Q3
 
-* 2018-06-28, 16:00: Foundations Team meeting
+* 2018-07-01: Beta release of VeraCrypt
 
-## 2018Q3
+* 2018-07-02, 15:00: VeraCrypt meeting
 
 * 2018-07-03, 19:00: [[Contributors meeting|contribute/meetings]]