Merge remote-tracking branch 'immerda/master'

Conflicts:
	manifests/init.pp
	manifests/polipo.pp
	manifests/polipo/base.pp
	manifests/torsocks.pp

diff --cc manifests/polipo/base.pp
Simple merge

diff --cc manifests/torsocks.pp
index 6346707989095de7277cf9f60f8235b133ebe78b,e3221c94a1417edfaecb622845f1b34ee4e69089..7bb51ee0081dbc9c00fc9164da5c03f6a9427cfb
--- 1/manifests/torsocks.pp
--- 2/manifests/torsocks.pp
+++ b/manifests/torsocks.pp
@@@ -1,7 -1,6 +1,7 @@@
  class tor::torsocks {
-   if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed'}
++  if !$torsocks_ensure_version { $torsocks_ensure_version = 'installed' }
    include ::tor
    package{'torsocks':
 -    ensure => present,
 +    ensure => $torsocks_ensure_version,
    }
  }