summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-02-05 12:20:43 +0000
committerintrigeri <intrigeri@boum.org>2016-02-05 12:20:43 +0000
commitc95e47a14493a1850113a83d9d13dceb96ef95dd (patch)
treeb05c9aabe5868e6f8509a77bf1d7e8386669e8f5
parent530cfff691fe16487c6eabf5b16e5d46d2285b99 (diff)
parentca1d0541f3be4cba2ba36aeb6e71127ea27e69f1 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--wiki/src/blueprint/SponsorS/reports/2016_01.mdwn8
-rw-r--r--wiki/src/contribute/meetings/201602.mdwn2
2 files changed, 8 insertions, 2 deletions
diff --git a/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn b/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
index c2961d8..cb25b2a 100644
--- a/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
+++ b/wiki/src/blueprint/SponsorS/reports/2016_01.mdwn
@@ -46,7 +46,13 @@ Everything in this report can be made public.
This is not a security problem in Tails since we drop non-Tor
traffic by default, but for this very reason in breaks the
functionality of the autoconfig wizard in the context of Tails.
- We started to write a proof-of-concept patch to fix this bug.
+ We started to write a proof-of-concept patch to fix this bug which
+ will be submitted upstream in February.
+
+ In order to improve Icedove's security in Tails and avoid unforeseen exploits,
+ we started evaluating an AppArmor profile for Icedove ([[!tails_ticket 10750]]).
+ We've asked the author to submit it upstream where it's now waiting to be merged.
+ In the meantime, we will ship this profile in Tails on our own.
## A.1.6. Release Icedove in Tails
diff --git a/wiki/src/contribute/meetings/201602.mdwn b/wiki/src/contribute/meetings/201602.mdwn
index 3905310..fb292e5 100644
--- a/wiki/src/contribute/meetings/201602.mdwn
+++ b/wiki/src/contribute/meetings/201602.mdwn
@@ -51,7 +51,7 @@ upgrades pinentry-gtk2 to 0.9.7-1
Right-now there as three keyboard shortcuts to change keyboard layout:
- - Shift+Super+Space which is provided by GNOME.
+ - Super+Space which is provided by GNOME.
- Shift+Shift which is custom to Tails (added in e492749). segfault
will see whether we should get rid of this one as well.
- Alt+Shift which is custom to Tails (added in 370f48c). Saying that