From: Roger Dingledine <arma@torproject.org>
Date: Thu, 17 Sep 2009 01:43:31 +0000 (-0400)
Subject: Merge commit 'mikeperry/circuitbuildtimeout-final'
X-Git-Tag: tor-0.2.2.2-alpha~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4850a3a75f4fa7da10d0c2bce23f0a517c6a29cb;p=thirdparty%2Ftor.git

Merge commit 'mikeperry/circuitbuildtimeout-final'
---

4850a3a75f4fa7da10d0c2bce23f0a517c6a29cb