systemd: include tor-disabling drop-ins in the package

QubesOS/qubes-issues#1625

Makefile

@@ -53,6 +53,7 @@ SYSTEM_DROPINS += tinyproxy.service
 SYSTEM_DROPINS += tmp.mount
 SYSTEM_DROPINS += org.cups.cupsd.service org.cups.cupsd.path org.cups.cupsd.socket
 SYSTEM_DROPINS += systemd-random-seed.service
+SYSTEM_DROPINS += tor.service tor@default.service
 
 USER_DROPINS := pulseaudio.service pulseaudio.socket
 

rpm_spec/core-vm.spec

@@ -581,6 +581,8 @@ The Qubes core startup configuration for SystemD init.
 /lib/systemd/system/ntpd.service.d/30_qubes.conf
 /lib/systemd/system/systemd-random-seed.service.d/30_qubes.conf
 /lib/systemd/system/tinyproxy.service.d/30_not_needed_in_qubes_by_default.conf
+/lib/systemd/system/tor.service.d/30_qubes.conf
+/lib/systemd/system/tor@default.service.d/30_qubes.conf
 /lib/systemd/system/tmp.mount.d/30_qubes.conf
 /lib/systemd/user/pulseaudio.service.d/30_qubes.conf
 /lib/systemd/user/pulseaudio.socket.d/30_qubes.conf