Merge remote-tracking branch 'public/bug16162_026'

changes/bug16162

@@ -0,0 +1,5 @@
+
+  o Minor bugfixes (systemd):
+    - Tor's systemd unit file no longer contains extraneous spaces.
+      These spaces would sometimes confuse tools like deb-systemd-helper.
+      Fixes bug 16162; bugfix on 0.2.5.5-alpha.

contrib/dist/tor.service.in

@@ -5,31 +5,31 @@
 # for your tor.service; it is not the last point.
 
 [Unit]
-Description = Anonymizing overlay network for TCP
+Description=Anonymizing overlay network for TCP
-After = syslog.target network.target nss-lookup.target
+After=syslog.target network.target nss-lookup.target
 
 [Service]
-Type = notify
+Type=notify
-NotifyAccess = all
+NotifyAccess=all
-ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config
+ExecStartPre=@BINDIR@/tor -f @CONFDIR@/torrc --verify-config
-ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc
+ExecStart=@BINDIR@/tor -f @CONFDIR@/torrc
-ExecReload = /bin/kill -HUP ${MAINPID}
+ExecReload=/bin/kill -HUP ${MAINPID}
-KillSignal = SIGINT
+KillSignal=SIGINT
-TimeoutSec = 30
+TimeoutSec=30
-Restart = on-failure
+Restart=on-failure
-WatchdogSec = 1m
+WatchdogSec=1m
-LimitNOFILE = 32768
+LimitNOFILE=32768
 
 # Hardening
-PrivateTmp = yes
+PrivateTmp=yes
-PrivateDevices = yes
+PrivateDevices=yes
-ProtectHome = yes
+ProtectHome=yes
-ProtectSystem = full
+ProtectSystem=full
-ReadOnlyDirectories = /
+ReadOnlyDirectories=/
-ReadWriteDirectories = -@LOCALSTATEDIR@/lib/tor
+ReadWriteDirectories=-@LOCALSTATEDIR@/lib/tor
-ReadWriteDirectories = -@LOCALSTATEDIR@/log/tor
+ReadWriteDirectories=-@LOCALSTATEDIR@/log/tor
-NoNewPrivileges = yes
+NoNewPrivileges=yes
-CapabilityBoundingSet = CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
+CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE
 
 [Install]
-WantedBy = multi-user.target
+WantedBy=multi-user.target