From: Roger Dingledine <arma@torproject.org>
Date: Mon, 30 May 2011 20:20:18 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.28-beta~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b586709c540b162a03e7f4dd9967251c904ba58b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2' into release-0.2.2
---

b586709c540b162a03e7f4dd9967251c904ba58b