From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 12 Jun 2015 09:56:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'earl/tor' into next
X-Git-Tag: v2.17-core92~10^2~52
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=31a849dd53128b3460f3d6f620a9ca286379e729;hp=6646be5a53c2fa4846f6403d887a2975469800f6

Merge remote-tracking branch 'earl/tor' into next

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

Conflicts:
	lfs/tor
---

diff --git a/lfs/tor b/lfs/tor
index 8eca48df58..eb188373d8 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.2.5.12
+VER        = 0.2.6.9
 
 THISAPP    = tor-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = "libevent2"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 89745069a7efb7aafd01ae263bd0fe5c
+$(DL_FILE)_MD5 = 4a1b334c30d7b37ea72fa33425220d5d
 
 install : $(TARGET)