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 58de7da86a2c5d4f3151cddff6f56219f383ddb0..f9c657c881a663d1cf1c7e54ecfe01d2a042c59d 100644 (file)
--- a/config/rootfiles/packages/tor
+++ b/config/rootfiles/packages/tor
@@ -5,7 +5,7 @@ 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
@@ -25,6 +25,7 @@ usr/local/bin/torctrl
 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