This shift was forgotten in the earlier commit.

Merge remote-tracking branch 'origin/feature/8031-refactor-10-rbb-hook' into feature/8031-refactor-10-rbb-hook

Conflicts:
	config/chroot_local-hooks/10-tbb

In conflict resolution, also update to TBB 4.0 checksums and url in
tbb-dist-url.txt and tbb-sha256sums.txt.

We also instruct the RM to check the url with https for some added
authentication.

This reverts commit 7b866f52.

With the upgrade to stable TBB 4.0, all desired locales are available
again.

Conflicts:
	wiki/src/doc/anonymous_internet/i2p.mdwn

We shouldn't let the user believe that they can "configure" Firefox to be the
Tor Browser.

This reverts commit 90e0d322.

Conflicts:
	po/fr.po

Merge remote-tracking branch 'origin/bugfix/8057-translatable-tor-browser-desktop-file' into testing

Merge remote-tracking branch 'origin/bugfix/8035-remove-branding-extension-in-unsafe-browser' into testing

... otherwise, there are great chances to mistakenly and partially upgrade to
Debian testing, and get a non-working system as a result.

This was used to block the upgrade of our equivs-generated iceweasel
package to the one in our APT repos before the TBB migration was
merged into devel. After that, the packages was removed, so this is
not needed any more.

It was added by mistake when adapting the script for the
TBB-migration.

We didn't do this prior to the TBB 4.x bump; 4.x's new directory
layout caused this, so now these must be explicitly deleted.

This instance was forgotten before.

It was a relic of the TBB 3.x times when the profile was located in
the parent directory of the TBB browser files.

Also patch Tails Greeter with the updated path. That patch should
be dropped once it's been upstreamed into Tails Greeter.