From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 24 Aug 2013 20:30:15 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=6ffa1bef03b981142217aecb02c6f00d4217a8ee;hp=9f6fd73bae357362817de5a50387acb7a0dd5aa0

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

diff --git a/lfs/tor b/lfs/tor
index ae63d961a..6161a5648 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = "libevent2"
 
diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor
index 4fef577ac..d631e867f 100644
--- a/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@ -9,13 +9,13 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
+
 function tor_is_enabled() {
 	[ "${TOR_ENABLED}" = "on" ] || [ "${TOR_RELAY_ENABLED}" = "on" ]
 }
 
 function setup_firewall() {
-	eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
-
 	# Flush all rules.
 	flush_firewall