]> gitweb.fluxo.info Git - puppet-tor.git/commitdiff
projects / puppet-tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89d3242 a780e84)
Merge branch 'master' of ssh://labs.riseup.net/shared-tor
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 21 Jan 2013 01:09:20 +0000 (23:09 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 21 Jan 2013 01:09:20 +0000 (23:09 -0200)
Conflicts:
manifests/daemon.pp


Trivial merge
Puppet module for tor