Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen

[people/teissler/ipfire-2.x.git] / config / rootfiles / packages / tor

diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor
index 864db663c1cc005418b2667c0005ca1f6ccdcc5a..f9c657c881a663d1cf1c7e54ecfe01d2a042c59d 100644 (file)
--- a/config/rootfiles/packages/tor
+++ b/config/rootfiles/packages/tor
@@ -1,13 +1,18 @@
 #etc/logrotate.d
 etc/logrotate.d/tor
 etc/rc.d/init.d/tor
+etc/rc.d/rc0.d/K40tor
+etc/rc.d/rc3.d/S60tor
+etc/rc.d/rc6.d/K40tor
 #etc/tor
-etc/tor/tor-tsocks.conf
+#etc/tor/tor-tsocks.conf
 etc/tor/torrc
+srv/web/ipfire/cgi-bin/tor.cgi
 usr/bin/tor
 usr/bin/tor-gencert
 usr/bin/tor-resolve
-usr/bin/torify
+#usr/bin/torify
+usr/local/bin/torctrl
 #usr/share/doc/tor
 #usr/share/doc/tor/tor-gencert.html
 #usr/share/doc/tor/tor-resolve.html
@@ -20,7 +25,9 @@ usr/bin/torify
 usr/share/tor
 usr/share/tor/defaults-torrc
 usr/share/tor/geoip
+usr/share/tor/geoip6
 var/ipfire/backup/addons/includes/tor
+var/ipfire/menu.d/EX-tor.menu
 var/ipfire/tor
 var/ipfire/tor/settings
 var/ipfire/tor/torrc