Merge remote-tracking branch 'earl/tor' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 5 Apr 2015 10:38:51 +0000 (12:38 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 5 Apr 2015 10:38:51 +0000 (12:38 +0200)

Trivial merge