Merge remote-tracking branch 'origin/feature/amd64-kernel' into experimental
Merge remote-tracking branch 'origin/feature/incremental-upgrades-integration' into experimental

Conflicts:
	wiki/src/contribute/design.mdwn
Merge remote-tracking branch 'origin/feature/poedit-from-backports' into experimental

Conflicts:
	config/chroot_apt/preferences
Merge remote-tracking branch 'origin/feature/spoof-mac' into experimental

Conflicts:
	po/ar.po
	po/da.po
	po/de.po
	po/es.po
	po/fa.po
	po/fr.po
	po/it.po
	po/ja.po
	po/lv.po
	po/nl.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ru.po
	po/sv.po
	po/tails.pot
	po/tr.po
	po/zh.po
	po/zh_CN.po
	refresh-translations
Merge remote-tracking branch 'winterfairy/bugfix/6478' into experimental
Merge branch 'feature/amd64-kernel' into experimental
Merge branch 'bugfix/6478' into experimental
Merge branch 'bugfix/tor-0.2.4-is-stable' into experimental
Merge branch 'bugfix/use-our-own-sqlite' into experimental
Merge branch 'feature/incremental-upgrades-integration' into experimental
Merge branch 'bugfix/6477-htpdate-user-agent' into experimental
Merge branch 'feature/torbrowser-24.2.0esr-1+tails1' into experimental

Conflicts:
	debian/changelog
Merge branch 'bugfix/6477-htpdate-user-agent' into experimental
Merge branch 'devel' into experimental
Merge branch 'feature/spoof-mac' into experimental

Conflicts:
	po/ar.po
	po/da.po
	po/de.po
	po/es.po
	po/fa.po
	po/fr.po
	po/it.po
	po/ja.po
	po/lv.po
	po/nl.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ru.po
	po/sv.po
	po/tails.pot
	po/tr.po
	po/zh.po
	po/zh_CN.po
Refresh translations.
Merge branch 'devel' into experimental
Merge branch 'devel' into experimental
Merge branch 'feature/amd64-kernel' into experimental
Merge branch 'feature/monkeysign' into experimental