From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 14 Sep 2013 12:37:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'earl/tor' into next
X-Git-Tag: v2.13-core73~19
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=d9949d4dd18789f18c21867cc3b7c6bbe3ba2801

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

Conflicts:
	lfs/tor
---

d9949d4dd18789f18c21867cc3b7c6bbe3ba2801