Merge remote-tracking branch 'earl/tor' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 12 Jun 2015 09:56:43 +0000 (11:56 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 12 Jun 2015 09:56:43 +0000 (11:56 +0200)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Conflicts:
lfs/tor


Trivial merge