From: Roger Dingledine <arma@torproject.org>
Date: Wed, 2 Sep 2009 02:49:37 +0000 (-0400)
Subject: Merge branch 'maint-0.2.1'
X-Git-Tag: tor-0.2.2.2-alpha~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8db3daa0c8d87cad55ca64ef5d0b383bd9b00c5a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.1'
---

8db3daa0c8d87cad55ca64ef5d0b383bd9b00c5a