Merge remote-tracking branch 'github/master'

Conflicts:
	templates/torrc.global.erb

diff --cc templates/torrc.global.erb
index c320bfae300b26413907961e0936c4001b144a04,1cfe36f1d0ab0a6cfb0a202d365ee08ca3c705e4..fc8c11e56291b16f3ebf546b8b2b8e2f6fd5143c
--- 1/templates/torrc.global.erb
--- 2/templates/torrc.global.erb
+++ b/templates/torrc.global.erb
@@@ -1,21 -1,24 +1,24 @@@
  # runtime
  RunAsDaemon 1
 -<%- if scope.lookupvar('tor::daemon::data_dir') != '/var/lib/tor' then -%>
 -DataDirectory <%= scope.lookupvar('tor::daemon::data_dir') %>
 -<%- end -%>
 +<%  if (v=scope.lookupvar('tor::daemon::data_dir')) != '/var/lib/tor' -%>
 +DataDirectory <%= v %>
 +<% end -%>
  
  # log
 -<%- if scope.lookupvar('tor::daemon::log_rules') != [] then -%>
 -<%-   for log_rule in scope.lookupvar('tor::daemon::log_rules') -%>
 -Log <%= log_rule %>
 -<%-   end -%>
 -<%- else -%>
 +<% if (rules=scope.lookupvar('tor::daemon::log_rules')).empty? -%>
  Log notice syslog
 -<%- end -%>
 +<%  else -%>
 +<%   rules.each do |log_rule| -%>
 +Log <%= log_rule %>
 +<%    end -%>
 +<%  end -%>
+ <%- if safe_logging != 1 then -%>
+ SafeLogging <%= safe_logging %>
+ <%-   end -%>
  
 -<%- if scope.lookupvar('tor::daemon::automap_hosts_on_resolve') != '0' then -%>
 -AutomapHostsOnResolve <%= scope.lookupvar('tor::daemon::automap_hosts_on_resolve') %>
 -<%- end -%>
 -<%- if scope.lookupvar('tor::daemon::use_bridges') != '0' then -%>
 -UseBridges <%= scope.lookupvar('tor::daemon::use_bridges') %>
 +<%  if (v=scope.lookupvar('tor::daemon::automap_hosts_on_resolve')) != '0' -%>
 +AutomapHostsOnResolve <%= v %>
 +<%  end -%>
 +<%  if (v=scope.lookupvar('tor::daemon::use_bridges')) != '0' -%>
 +UseBridges <%= v %>
  <%- end -%>