From: Roger Dingledine <arma@torproject.org>
Date: Wed, 29 Sep 2010 21:21:43 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.1-alpha~352
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=355fc63790bedfd00c062d6aa8d60f00307dc03f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

355fc63790bedfd00c062d6aa8d60f00307dc03f