From: Roger Dingledine <arma@torproject.org>
Date: Mon, 31 Aug 2009 20:26:01 +0000 (-0400)
Subject: Merge branch 'maint-0.2.1'
X-Git-Tag: tor-0.2.2.2-alpha~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a225469ded4963e1197818c2fa58c079119cb309;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.1'
---

a225469ded4963e1197818c2fa58c079119cb309