From: Roger Dingledine <arma@torproject.org>
Date: Thu, 30 Sep 2010 04:10:14 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.1-alpha~351
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea6ac0f0d1faa946df7336d65eddb54172b7ecd4;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

ea6ac0f0d1faa946df7336d65eddb54172b7ecd4