Enable AppArmor LSM.
Install the AppArmor userspace tools from Debian unstable.
Add AppArmor profile for Vidalia.

The idea is to test it in this branch so that we can get it included into
Debian soon.
Add AppArmor profile for Tor.

The idea is to test it in this branch so that we can get it included into
Debian soon.
Add AppArmor profile for Evince.

The idea is to test it in this branch so that we can get it included into
Debian soon.
Merge branch 'devel' into feature/apparmor

Conflicts:
	config/amnesia
	config/chroot_apt/preferences
Merge branch 'feature/wheezy' into feature/apparmor

Conflicts:
	config/chroot_local-packageslists/tails-common.list
Don't ship an AppArmor profile for Tor, the Debian package does.

This reverts commit 87b78ac92c14c707e3d058de696d710010af0e9d.
Add AppArmor alias from / to /lib/live/mount/rootfs/filesystem.squashfs/.

This is supposedly needed to take advantage of John Johansen's aliaspatch.
Update Vidalia's AppArmor profile to what's in Debian.
Merge branch 'feature/wheezy' into feature/apparmor

Conflicts:
	wiki/src/doc/first_steps/accessibility.fr.po
Ship an empty /etc/apparmor.d/local/usr.bin.vidalia that the usr.bin.vidalia profile depends on.
Disable TCP timestamps (Closes: #6579).
Merge branch 'stable' into feature/6579-disable-tcp-timestamps
Add design doc bits about TCP time stamps.
Use sudo instead of gksudo for running tails-upgrade-frontend (Closes: #7431).
Run tails-persistence-setup with sudo instead of gksudo.

This way, stderr is output to the terminal (when running t-p-s on the
command-line) or to .xsession-errors (otherwise), which eases debugging
and error reporting. This mitigates #7623, without resolving it entirely yet.
Forward addition arguments to t-p-s from its wrapper.

This is one more step toward resolving #7623: the sudo configuration still
prevents one from passing arbitrary arguments, but at least the wrapper would
support it.
Allow the desktop user to pass --verbose to t-p-s via sudo (Closes: #7623).
Merge branch 'devel' into feature/apparmor

Conflicts:
	config/amnesia
	config/chroot_local-packageslists/tails-common.list
	wiki/src/doc/advanced_topics/virtualization.fr.po
	wiki/src/doc/first_steps/startup_options/windows_camouflage.fr.po