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

Merge branch 'maint-0.2.2'
---

8d1fe502842a01063027a8dc2a4cb1326be8805a