[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 31a849dd53128b3460f3d6f620a9ca286379e729

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 31a849dd53128b3460f3d6f620a9ca286379e729

[git]

[-- Attachment #1: Type: text/plain, Size: 2472 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  31a849dd53128b3460f3d6f620a9ca286379e729 (commit)
       via  57a3100d2dc91fd7dea7204e3c77d17d723d66d1 (commit)
       via  1ea718199ae6cd3d2e6c015fb9d51c62fc8ef74e (commit)
       via  8be4674c92a9f86661d6ff068008e03e89b37a56 (commit)
      from  6646be5a53c2fa4846f6403d887a2975469800f6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31a849dd53128b3460f3d6f620a9ca286379e729
Merge: 6646be5 57a3100
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Jun 12 11:56:43 2015 +0200

    Merge remote-tracking branch 'earl/tor' into next
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    
    Conflicts:
    	lfs/tor

commit 57a3100d2dc91fd7dea7204e3c77d17d723d66d1
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date:   Fri Jun 12 00:05:02 2015 +0200

    tor: update to 0.2.6.9

commit 1ea718199ae6cd3d2e6c015fb9d51c62fc8ef74e
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date:   Thu May 21 20:06:04 2015 +0200

    tor: update to 0.2.6.8

commit 8be4674c92a9f86661d6ff068008e03e89b37a56
Merge: b1636ef eb3c6c4
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date:   Wed Apr 8 07:47:06 2015 +0200

    Merge branch 'master' into tor

-----------------------------------------------------------------------

Summary of changes:
 lfs/tor | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/lfs/tor b/lfs/tor
index 8eca48d..eb18837 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)
 


hooks/post-receive
--
IPFire 2.x development tree