From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 14 Jul 2011 21:22:23 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=852b1312812bd0174353271c5a2d42ed08c6b8a2;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/control.c
---

852b1312812bd0174353271c5a2d42ed08c6b8a2