From: Roger Dingledine <arma@torproject.org>
Date: Thu, 13 Oct 2011 14:14:38 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.6-alpha~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a083b0188cacd2f07838ff0446113bd5211a024;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

0a083b0188cacd2f07838ff0446113bd5211a024