Install:

  * ttdnsd from their unstable repository (it's not distributed through the
    Wheezy one)
  * Tor from their Wheezy repository (with higher priority than the official
    Debian repositories, to match what we are doing in the Squeeze images)
  * other packages from their Wheezy repository, at APT's liking (pinned to 990,
    like the official Wheezy and wheezy-updates repositories)

We probably want to prefer stuff from their Wheezy repository, so add this one.

But some software we still ship (e.g. ttdnsd) is only distributed through the
unstable repository currently, so keep that other one around for now.

Conflicts:
	config/chroot_local-hooks/98-remove_unwanted_packages
	config/chroot_sources/torproject.chroot

(Disclaimer: it may seem strange to see this in a feature/tor-0.2.4 branch, but
this branch just changed how these things work, and it wasn't documented yet, so
I had to write the section before I could update it :)

Else, Tor 0.2.4's IsolateSOCKSAuth and connect-proxy sometimes play together in
some way that makes connect-proxy ask for a password to connect to
the SocksPort.

Note that connect-socks uses the default SocksPort too, so no change here wrt.
our connection isolation design.

Else, Tor 0.2.4's IsolateSOCKSAuth and connect-proxy sometimes play together in
some way that makes connect-proxy ask for a password to connect to
the SocksPort.

SOCKS5_USER and SOCKS5_PASSWORD are passed through unchanged if they were
manually set by the user already.

Revert "Prevent some unwanted packages to be installed at all, rather than uninstalling them later."

This reverts commit 87a2c027.

Conflicts:
	config/chroot_apt/preferences

Setting the pin-priority of some packages to -1, make it impossible to
install them with a canonical `apt-get install $package` command.

Merge remote-tracking branch 'origin/feature/More_uniq_built_iso_name_in_jenkins' into feature/wheezy

Keep their `squeeze' APT suite enabled, as we take obfsproxy and ttdnsd
from there.

This reverts commit cedc363e, reversing
changes made to 87af3d71.

The wrong branch was merged.

This reverts commit bde4a069, reversing
changes made to 570d4114.

The wrong branch was merged.

The upstream live-boot initscript (shipped by live-config) doesn't know about
our persistent mounts (/live/persistence/*), since they are performed from GDM,
and not further moved to the same place as mounts done during initramfs are
(/lib/live/mount/persistence/*).

Therefore, it can't remount them read-only at shutdown/reboot time. So, let's
patch the upstream file at build time for now, to let it know about
our mountpoints.

A possibly better long-term solution would be to have this change merged
upstream, but it's likely not to please them so much.

An even better long-term solution would be to have the live-boot code we use in
live-persist also move the mounts to the expected place. This could be part of
upstreaming live-persist, presumably.

On the other hand, all this upstreaming would be only so that our weird usecase
is better supported there; it does not look like similar features have been
asked by anyone else, so we may be as well served by maintaining this patch
directly in Tails.

The consistent path implies that there can only be one unlocked
persistence directory, so we also simplify the script by removing the
parts dealing with mulitple lists.

Conflicts:
	wiki/src/doc/get/verify_the_iso_image_using_other_operating_systems.fr.po