Merge remote-tracking branch 'origin/master'

wiki/src/contribute/calendar.mdwn

@@ -4,13 +4,6 @@ All times are referenced to Berlin and Paris time.
 
 ## 2018Q3
 
-* 2018-08-08 to 2018-08-09: port Tails to Tor Browser based on Firefox
-  60ESR ([[!tails_ticket 15023]]) — intrigeri and segfault
-
-* 2018-08-15: Feature freeze for 3.9. Everything you want to see in
-  Tails 3.9 must be merged into our devel branch by 17:00 CEST
-  that day.
-
 * 2018-08-16: Build and upload tentative 3.9~rc1 ISO image — intrigeri
 
 * 2018-08-17: Test and release 3.9~rc1 — intrigeri

wiki/src/contribute/release_process.mdwn

@@ -38,7 +38,8 @@ the scripts snippets found on this page:
 * `NEXT_PLANNED_MINOR_VERSION`: set to the version number of the next
   *minor* Tails release; if the next release is a point-release, use
   that one; otherwise, use `${VERSION}.1`
-* `MAJOR_RELEASE`: set to 1 if preparing a major release, to 0 else
+* `MAJOR_RELEASE`: set to 1 if preparing a major release or a release
+  candidate for a major release, to 0 otherwise
 * `ISOS`: the directory where one stores `tails-amd64-*`
   sub-directories like the ones downloaded with BitTorrent.
 * `ARTIFACTS`: the directory where build artifacts (e.g.
@@ -57,7 +58,7 @@ the scripts snippets found on this page:
 * `DIST`: either 'alpha' (for RC:s) or 'stable' (for actual releases)
 * `export DEBEMAIL='tails@boum.org'`
 * `export DEBFULLNAME='Tails developers'`
-* `export WEBSITE_RELEASE_BRANCH="web/release-${VERSION:?}"`
+* `export WEBSITE_RELEASE_BRANCH="web/release-${TAG:?}"`
 
 Pre-freeze
 ==========

wiki/src/contribute/release_process/Debian_security_updates.mdwn

@@ -8,22 +8,18 @@ by delaying a Tails release a bit to wait for a DSA to happen.
 Debian security team
 ====================
 
-RequestTracker
---------------
-
-The Debian security team uses the [Debian RT](https://rt.debian.org/)
-to track some of their work. Looking at their RT queues might help us
-see if something is being prepared. We, as a Debian derivative, have a
-read-only access to these queues.
-
 Security tracker
 ----------------
 
-The Debian [security tracker][web]'s [SVN repository][svn] is the main
-place where we can look at the Debian security team upcoming uploads
-and announces. There is also a [mailing list][] that broadcasts
-changes to this repository.
+The Debian [security tracker][web]'s [GIT repository][git] is the main
+place where Debian tracks the status of security issues.
+
+We can look at the [list of upcoming Debian Security Advisories (DSA)][DSA needed].
+
+There is also a [mailing list][] that broadcasts changes to
+this repository.
 
 [web]: http://security-tracker.debian.org/tracker/
-[svn]: http://svn.debian.org/wsvn/secure-testing
-[mailing list]: http://lists.alioth.debian.org/mailman/listinfo/secure-testing-commits
+[git]: https://salsa.debian.org/security-tracker-team/security-tracker
+[mailing list]: https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-security-tracker-commits
+[DSA needed]: https://salsa.debian.org/security-tracker-team/security-tracker/blob/master/data/dsa-needed.txt

wiki/src/contribute/release_process/test.mdwn

@@ -140,11 +140,11 @@ tracked by tickets prefixed with `todo/test_suite:`.
 # Thunderbird
 
 * Check mail over IMAP using:
-  - a hidden service IMAP server (e.g. Riseup, zsolxunfmbfuq7wf.onion with SSL).
+  - a hidden service IMAP server (e.g. Riseup, zsolxunfmbfuq7wf.onion on port 993 with SSL).
 * Check mail over POP using:
-  - a hidden service POP server (see above).
+  - a hidden service POP server (see above, on port 995 with SSL).
 * Send an email using:
-  - a hidden service SMTP server (see above).
+  - a hidden service SMTP server (see above, on port 465 with SSL).
 
 * Check that the profile works and is torified:
   1. Send an email using Thunderbird and a non-anonymizing SMTP relay (a