From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Sep 2009 23:37:26 +0000 (-0400)
Subject: Merge commit 'origin/maint-0.2.1'
X-Git-Tag: tor-0.2.2.2-alpha~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed7283d28317fd379f26ea9384eaf91e41bd760a;p=thirdparty%2Ftor.git

Merge commit 'origin/maint-0.2.1'

Resolved conflicts in:
	src/or/circuitbuild.c
---

ed7283d28317fd379f26ea9384eaf91e41bd760a