diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 23:09:20 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 23:09:20 -0200 |
| commit | f252115be193d58d345b7d18228800c68a1e47aa (patch) | |
| tree | 31c95ada21d54314ecb1650f2b19e8540386dd62 /files | |
| parent | 89d3242cc7d4607f5eb8f1df39985c3597ee428d (diff) | |
| parent | a780e84001177f10a86a7bf824589c0553f513a0 (diff) | |
| download | puppet-tor-f252115be193d58d345b7d18228800c68a1e47aa.tar.gz puppet-tor-f252115be193d58d345b7d18228800c68a1e47aa.tar.bz2 | |
Merge branch 'master' of ssh://labs.riseup.net/shared-tor
Conflicts:
manifests/daemon.pp
Diffstat (limited to 'files')
| -rw-r--r-- | files/polipo/polipo.conf (renamed from files/polipo.conf) | 0 | ||||
| -rwxr-xr-x | files/polipo/polipo.cron (renamed from files/polipo.cron) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/files/polipo.conf b/files/polipo/polipo.conf index 12b10c4..12b10c4 100644 --- a/files/polipo.conf +++ b/files/polipo/polipo.conf diff --git a/files/polipo.cron b/files/polipo/polipo.cron index aba88bc..aba88bc 100755 --- a/files/polipo.cron +++ b/files/polipo/polipo.cron |