From: Roger Dingledine <arma@torproject.org>
Date: Sun, 29 May 2011 23:11:07 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6917728637bdbaed86d48d394eab6a063c319269;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

6917728637bdbaed86d48d394eab6a063c319269