From: Roger Dingledine <arma@torproject.org>
Date: Wed, 18 May 2011 01:15:33 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.27-beta~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16c7b05ac6238697128306b5b72cdc3155d51b4e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2' into release-0.2.2
---

16c7b05ac6238697128306b5b72cdc3155d51b4e