From: Roger Dingledine <arma@torproject.org>
Date: Thu, 8 Dec 2011 09:40:30 +0000 (-0500)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.9-alpha~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=630337e7626d19f33eba6436dbd0aae1fee94f1e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

630337e7626d19f33eba6436dbd0aae1fee94f1e