Merge branch 'master' into stable

20c85517 · anonym · 250c9db5 · 9a087703 · 20c85517
Commit 20c85517 authored Jan 23, 2018 by anonym
--- a/debian/changelog
+++ b/debian/changelog
-tails (3.5.1) UNRELEASED; urgency=medium
-
-  * Dummy entry for potential emergency release.
-
- -- Tails developers <tails@boum.org>  Tue, 23 Jan 2018 01:33:25 +0100
-
 tails (3.5) unstable; urgency=medium

  * Security fixes