Have tor_bootstrap_progress echo 0 if no matching log line is found (Closes: #8257).
Merge branch 'bugfix/8257-more-robust-tor_bootstrap_progress' into experimental
Install torsocks (2.x) from wheezy-backports (Closes: #8220).
Merge branch 'devel' into feature/6880-torsocks-2
Use torsocks for whois, instead of torify.
Use torsocks for Gobby, instead of torify.
Wrap Totem to torify it with torsocks.

Also, AppArmor: allow Totem to read torsocks.conf. Technically speaking, it's
not really required, as the compiled-in defaults are the same as whatever is in
the stock torsocks.conf. But still, this avoids nasty error messages in the logs
and when running Totem from a terminal.
Merge branch 'feature/6880-torsocks-2' into experimental