summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-06 15:21:45 -0500
committerNick Mathewson <nickm@torproject.org>2018-11-06 15:21:45 -0500
commitc60f3ea6077451facf2335b7a7c4bc9eaf13c038 (patch)
tree2c6b62c420f106a72bd3652b3a237475d071b870 /contrib
parent8a5590ebace8a1c1b367e0eec29ed8bc2712e812 (diff)
parentbd0e38dcfeb63303af83069e4e1e4c70982c56d7 (diff)
downloadtor-c60f3ea6077451facf2335b7a7c4bc9eaf13c038.tar.gz
tor-c60f3ea6077451facf2335b7a7c4bc9eaf13c038.zip
Merge remote-tracking branch 'tor-github/pr/474' into maint-0.3.5
Diffstat (limited to 'contrib')
-rw-r--r--contrib/dist/tor.service.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/dist/tor.service.in b/contrib/dist/tor.service.in
index 9c1a255b2e..e857a8664e 100644
--- a/contrib/dist/tor.service.in
+++ b/contrib/dist/tor.service.in
@@ -15,7 +15,7 @@ ExecStartPre=@BINDIR@/tor -f @CONFDIR@/torrc --verify-config
ExecStart=@BINDIR@/tor -f @CONFDIR@/torrc
ExecReload=/bin/kill -HUP ${MAINPID}
KillSignal=SIGINT
-TimeoutSec=30
+TimeoutSec=60
Restart=on-failure
WatchdogSec=1m
LimitNOFILE=32768