From: Roger Dingledine <arma@torproject.org>
Date: Thu, 7 Jul 2011 17:31:08 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aeb117f62c1831a434e167cdf6b0cc4e970728ce;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

aeb117f62c1831a434e167cdf6b0cc4e970728ce