]> gitweb.fluxo.info Git - puppet-tor.git/commit
Merge remote-tracking branch 'shared/master'
authorintrigeri <intrigeri@boum.org>
Sat, 4 Aug 2012 14:49:53 +0000 (16:49 +0200)
committerintrigeri <intrigeri@boum.org>
Sat, 4 Aug 2012 14:49:53 +0000 (16:49 +0200)
commit817a37f02ec443603cbfe7e2cc5c55e07a2a471c
tree0a4fc1506a864ec498ed7024722c5d193c755558
parentd017a7eee415a1398a0f7e533a5bfba3986e7505
parent43f26a0ff6e7e882ed241a26c99f09d669524440
Merge remote-tracking branch 'shared/master'

Conflicts:
manifests/daemon.pp
manifests/daemon.pp
templates/torrc.relay.erb