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

Conflicts:
	contrib/dist/tor.service.in

diff --cc contrib/dist/tor.service.in
index 8c70ccc6e387dc9fbd79deb7c97a70aa808fcf28,c4709a7fd6ece2d82a1ac2e709b9b75545ef01f9..20ceecf0ca604416789c15482afa2a18e731e6b3
--- 1/contrib/dist/tor.service.in
--- 2/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