Merge branch 'master' of git://git.tails.boum.org/tails
Merge branch 'master', remote branch 'origin'
Merge branch 'master' of git://git.tails.boum.org/tails
rsync does not check if enough space is available on the destination before running
Support unquoted version field.

Depending on something (Debian release being used?) it gets quoted, or not.
usewithtor--, torsocks++
Better look at syslog: it contains dmesg, and more.
Merge commit '391118d00436c6e4aa13dbad2e125ee7be3505b6'
Drop useless test.

We very well know it doesn't work in many cases. We have a ticket tracking it.
We actually *can* test that.