From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 21 Jan 2013 01:09:20 +0000 (-0200)
Subject: Merge branch 'master' of ssh://labs.riseup.net/shared-tor
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f252115be193d58d345b7d18228800c68a1e47aa;p=puppet-tor.git

Merge branch 'master' of ssh://labs.riseup.net/shared-tor

Conflicts:
	manifests/daemon.pp
---

f252115be193d58d345b7d18228800c68a1e47aa