Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/daemon.pp

diff --cc manifests/daemon.pp
index d04734d4f261f0828a74af2601a70d788e5d4e45,7661a433c557831b5e7659c19216f7a9d8ccca9d..e6d0c2e31fd1af92a25d2462f7ef4cb6e8104ffb
--- 1/manifests/daemon.pp
--- 2/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@@ -193,45 -194,16 +202,55 @@@ class tor::daemon inherits tor 
      }
    } 
  
- }
 +  # DNS definition
 +  define dns( $port = 0,
 +              $listen_addresses = [],
 +              $ensure = present ) {
 +
 +      concatenated_file_part { "08.dns.${name}":
 +      dir     => $tor::daemon::snippet_dir,
 +      content => template('tor/torrc.dns.erb'),
 +      owner => 'debian-tor', group => 'debian-tor', mode => 0644,
 +      ensure  => $ensure,
 +    }
 +  }
 +
 +  # Transparent proxy definition
 +  define transparent( $port = 0,
 +                      $listen_addresses = [],
 +                      $ensure = present ) {
 +
 +      concatenated_file_part { "09.transparent.${name}":
 +      dir     => $tor::daemon::snippet_dir,
 +      content => template('tor/torrc.transparent.erb'),
 +      owner => 'debian-tor', group => 'debian-tor', mode => 0644,
 +      ensure  => $ensure,
 +    }
 +  }
 +
 +  # Bridge definition
 +  define bridge( $ip,
 +                 $port,
 +                 $fingerprint = false,
 +                 $ensure = present ) {
 +
 +    concatenated_file_part { "10.bridge.${name}":
 +      dir     => $tor::daemon::snippet_dir,
 +      content => template('tor/torrc.bridge.erb'),
 +      owner => 'debian-tor', group => 'debian-tor', mode => 0644,
 +      ensure  => $ensure,
 +    }
 +  }
 +
+   # map address definition
+   define map_address( $address = '',
+                       $newaddress = '') {
  
 -
+     concatenated_file_part { "08.map_address.${name}":
+       dir     => $tor::daemon::snippet_dir,
+       content => template('tor/torrc.map_address.erb'),
+       owner   => 'debian-tor', group => 'debian-tor', mode => 0644,
+       ensure  => $ensure,
+     }
+   }
+ }

diff --cc templates/torrc.relay.erb
Simple merge