Merge remote-tracking branch 'stevee/tor-update' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Jul 2014 20:44:10 +0000 (22:44 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Jul 2014 20:44:10 +0000 (22:44 +0200)

Trivial merge