Merge remote-tracking branch 'intrigeri/bug12731-systemd-no-run-as-daemon' into maint...

Conflicts:
	contrib/dist/tor.service.in

diff --cc contrib/dist/tor.service.in
index 9914a7889512c1051d5d0f918fc9c2842c8ca138,1d52f622fa3358e2ab36f605d3a4399315a60ba8..2fe51c75d912d276e761359e42aaa645abc9d107
--- 1/contrib/dist/tor.service.in
--- 2/contrib/dist/tor.service.in
+++ b/contrib/dist/tor.service.in
@@@ -4,8 -4,9 +4,10 @@@ After = syslog.target network.target ns
  
  [Service]
  Type = simple
- ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc
 +ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config
+ # A torrc that has "RunAsDaemon 1" won't work with the "simple" service type;
+ # let's explicitly override it.
+ ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc --RunAsDaemon 0
  ExecReload = /bin/kill -HUP ${MAINPID}
  KillSignal = SIGINT
  TimeoutSec = 30