From owner-svn-ports-head@FreeBSD.ORG  Sun Jun 16 22:42:54 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id CF47AA0A;
 Sun, 16 Jun 2013 22:42:54 +0000 (UTC) (envelope-from bf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C192D1CCF;
 Sun, 16 Jun 2013 22:42:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5GMgsbN010885;
 Sun, 16 Jun 2013 22:42:54 GMT (envelope-from bf@svn.freebsd.org)
Received: (from bf@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5GMgsEV010883;
 Sun, 16 Jun 2013 22:42:54 GMT (envelope-from bf@svn.freebsd.org)
Message-Id: <201306162242.r5GMgsEV010883@svn.freebsd.org>
From: Brendan Fabeny <bf@FreeBSD.org>
Date: Sun, 16 Jun 2013 22:42:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321080 - in head/security/tor-devel: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jun 2013 22:42:54 -0000

Author: bf
Date: Sun Jun 16 22:42:53 2013
New Revision: 321080
URL: http://svnweb.freebsd.org/changeset/ports/321080

Log:
  Disable the faulty fix for Tor bug 9063, which could compromise anonymity
  
  Security:	Tor bug 9072

Added:
  head/security/tor-devel/files/patch-src__or__relay.c   (contents, props changed)
Modified:
  head/security/tor-devel/Makefile

Modified: head/security/tor-devel/Makefile
==============================================================================
--- head/security/tor-devel/Makefile	Sun Jun 16 22:03:47 2013	(r321079)
+++ head/security/tor-devel/Makefile	Sun Jun 16 22:42:53 2013	(r321080)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tor
 DISTVERSION=	0.2.4.13-alpha
+PORTREVISION=	1
 CATEGORIES=	security net ipv6
 MASTER_SITES=	https://www.torproject.org/dist/ \
 		ftp://ftp.bit.nl/mirror/tor/ \

Added: head/security/tor-devel/files/patch-src__or__relay.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/tor-devel/files/patch-src__or__relay.c	Sun Jun 16 22:42:53 2013	(r321080)
@@ -0,0 +1,21 @@
+--- src/or/relay.c.orig	2013-06-14 04:07:30.000000000 -0400
++++ src/or/relay.c	2013-06-15 05:20:19.000000000 -0400
+@@ -2482,6 +2482,10 @@
+     streams_blocked = circ->streams_blocked_on_p_chan;
+   }
+ 
++  /*
++   * Disabling this for now because of a possible guard discovery attack
++   */
++#if 0
+   /* Are we a middle circuit about to exceed ORCIRC_MAX_MIDDLE_CELLS? */
+   if ((circ->n_chan != NULL) && CIRCUIT_IS_ORCIRC(circ)) {
+     orcirc = TO_OR_CIRCUIT(circ);
+@@ -2505,6 +2509,7 @@
+       }
+     }
+   }
++#endif
+ 
+   cell_queue_append_packed_copy(queue, cell, chan->wide_circ_ids);
+