From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 3 Sep 2014 17:29:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'intrigeri/bug12939-systemd-no-new-privileges'
X-Git-Tag: tor-0.2.6.1-alpha~154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54348201f7cce9c0c01e9d4835714a2fec55c67c;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'intrigeri/bug12939-systemd-no-new-privileges'

Conflicts:
	contrib/dist/tor.service.in
---

54348201f7cce9c0c01e9d4835714a2fec55c67c
diff --cc contrib/dist/tor.service.in
index 8c70ccc6e3,c4709a7fd6..20ceecf0ca
--- a/contrib/dist/tor.service.in
+++ b/contrib/dist/tor.service.in
@@@ -19,9 -19,7 +19,10 @@@ PrivateTmp = ye
  DeviceAllow = /dev/null rw
  DeviceAllow = /dev/urandom r
  InaccessibleDirectories = /home
 +ReadOnlyDirectories = /
 +ReadWriteDirectories = @LOCALSTATEDIR@/lib/tor
 +ReadWriteDirectories = @LOCALSTATEDIR@/log/tor
+ NoNewPrivileges = yes
  
  [Install]
  WantedBy = multi-user.target