From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 12 Jun 2015 09:56:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'earl/tor' into next
X-Git-Tag: v2.17-core92~10^2~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31a849dd53128b3460f3d6f620a9ca286379e729;p=ipfire-2.x.git

Merge remote-tracking branch 'earl/tor' into next

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

Conflicts:
	lfs/tor
---

31a849dd53128b3460f3d6f620a9ca286379e729