From: Roger Dingledine <arma@torproject.org>
Date: Sat, 21 May 2011 22:14:16 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb7fff193e2749f241e646b155de3ee33623606e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

cb7fff193e2749f241e646b155de3ee33623606e