Merge remote-tracking branch 'origin/bugfix/8470-clean-up-apt-pinning' into devel

fix-commited: #8470 Thanks!
Merge remote-tracking branch 'origin/feature/6880-torsocks-2' into devel

fix-committed: #5379 Remove Polipo or replace it with Privoxy

Conflicts:
	config/binary_rootfs/squashfs.sort
Merge branch 'devel' into experimental

Conflicts:
	config/binary_rootfs/squashfs.sort