From: Roger Dingledine <arma@torproject.org>
Date: Mon, 12 Sep 2011 09:54:55 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.4-alpha~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e1cc43b5723008dc6ec19188b1613c3682c36d3;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

1e1cc43b5723008dc6ec19188b1613c3682c36d3