From: Roger Dingledine <arma@torproject.org>
Date: Sun, 29 May 2011 23:11:22 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.28-beta~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=688400c596c09e9a6d1a26668e4843ccd946a7be;p=thirdparty%2Ftor.git

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

688400c596c09e9a6d1a26668e4843ccd946a7be