From: Roger Dingledine <arma@torproject.org>
Date: Sun, 5 Jun 2011 15:14:28 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96da10aace8aa9486872a21986a191b07821a506;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

96da10aace8aa9486872a21986a191b07821a506