From: Roger Dingledine <arma@torproject.org>
Date: Fri, 28 Aug 2009 07:47:18 +0000 (-0400)
Subject: Merge branch 'maint-0.2.1'
X-Git-Tag: tor-0.2.2.2-alpha~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0bb59f1c38eef467a353faf1a30cf93b64209a27;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.1'
---

0bb59f1c38eef467a353faf1a30cf93b64209a27