From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 May 2015 17:18:51 +0000 (-0400)
Subject: Revert the broken part of 548b4be
X-Git-Tag: tor-0.2.7.2-alpha~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fee289d2406e8d018409e22f48cd853860177a1;p=thirdparty%2Ftor.git

Revert the broken part of 548b4be

Fixes 16152.
---

diff --git a/changes/bug16152 b/changes/bug16152
new file mode 100644
index 0000000000..8b93a60715
--- /dev/null
+++ b/changes/bug16152
@@ -0,0 +1,3 @@
+  o Minor bugfixes (systemd):
+    - Fix an accidental formatting error that broke the systemd
+      configuration file. Fixes bug 16152; bugfix on 0.2.7.1-alpha.
diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in
index 8ed5ad227a..ae339ff844 100644
--- a/contrib/dist/tor.service.in
+++ b/contrib/dist/tor.service.in
@@ -8,10 +8,16 @@
 Description = Anonymizing overlay network for TCP
 After = syslog.target network.target nss-lookup.target
 
-[Service] Type = notify NotifyAccess = all ExecStartPre = @BINDIR@/tor
--f @CONFDIR@/torrc --verify-config ExecStart = @BINDIR@/tor -f
-@CONFDIR@/torrc ExecReload = /bin/kill -HUP ${MAINPID} KillSignal =
-SIGINT TimeoutSec = 30 Restart = on-failure WatchdogSec = 1m
+[Service]
+Type = notify
+NotifyAccess = all
+ExecStartPre = @BINDIR@/tor -f @CONFDIR@/torrc --verify-config
+ExecStart = @BINDIR@/tor -f @CONFDIR@/torrc
+ExecReload = /bin/kill -HUP ${MAINPID}
+KillSignal = SIGINT
+TimeoutSec = 30
+Restart = on-failure
+WatchdogSec = 1m
 LimitNOFILE = 32768
 
 # Hardening