From: Roger Dingledine <arma@torproject.org>
Date: Wed, 26 Oct 2011 20:36:59 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.6-alpha~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9625a2e8f5070198f58b3c343e65a3ac99765ede;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

9625a2e8f5070198f58b3c343e65a3ac99765ede