From: Roger Dingledine <arma@torproject.org>
Date: Fri, 1 Oct 2010 18:12:11 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.1-alpha~331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=165aaf560a7249a388e916659d55ec6fa1d2fd24;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

165aaf560a7249a388e916659d55ec6fa1d2fd24