Merge branch 'stable' into feature/7512-Make-GnuPG-config-closer-to-duraconf-reworked
Add placeholder so that we don't forget to document that persistent gpg.conf need to be updated.
Merge branch 'feature/7512-Make-GnuPG-config-closer-to-duraconf-reworked' into experimental
Have GnuPG directly use the Tor SOCKS port (Closes: #7416).

This is one step on the road towards removing Polipo (see #5379).
Merge branch 'feature/7416-gnupg-socks' into experimental
Wrap wget with torsocks, instead of configuring it to use Polipo (Closes: #6623).

This is yet another step on the road towards removing Polipo.
Add a design doc section about how we torify wget.
Merge branch 'feature/6623-wget-socks' into experimental

Conflicts:
	wiki/src/contribute/design.mdwn
Have APT directly use the Tor SOCKS proxy (Closes: #8194).

At the end of the chroot_local-hooks stage, we replace the hook that used to
tell APT to use the Polipo HTTP proxy with another one that does (a more
elaborate version) s,http://,tor+http://, in APT sources.

Then, APT will use the "tor+http" method, that we install in
/usr/lib/apt/methods, and that is a simple torsocks wrapper for the
"http" method.
Move code for toggling tor+http to a dedicated, more generic program.
Adjust hook that includes syslinux in the ISO filesystem to APT being moved from HTTP to SOCKS.

Don't run apt-get update in the chroot again after reconfiguring APT sources
for runtime.

This is broken by the move to torsocks. Back when we used a HTTP proxy, the
HTTP_PROXY environment variable passed by the build environment was overriding
the APT proxy configured for runtime. This is not the case anymore, and now that
APT run tries to use both the tor+http shim and the HTTP proxy used in the build
environment, which is rejected by torsocks.

Besides, the build process works just fine without this "apt-get update" run,
so let's just drop it.
Add design documentation wrt. how we configure APT.
Merge branch 'feature/8194-APT-socks' into experimental

Conflicts:
	wiki/src/contribute/design.mdwn
Merge branch 'feature/7416-gnupg-socks' into feature/5379-remove-polipo
Merge branch 'feature/6623-wget-socks' into feature/5379-remove-polipo
Merge branch 'feature/8194-APT-socks' into feature/5379-remove-polipo

Conflicts:
	wiki/src/contribute/design.mdwn
Remove all traces of Polipo: we don't use it anymore (Closes: #5379, #6115).
Merge branch 'feature/5379-remove-polipo' into experimental

Conflicts:
	wiki/src/contribute/design.mdwn