Comment 16 for bug 1766542

For the apt side, that's the first commit in

https://salsa.debian.org/apt-team/apt/merge_requests/18/

I'll also upload that to bionic eventually; but xenial would also need the happy eyeballs changes, which were a bit large (although, isolated).