From: Roger Dingledine <arma@torproject.org>
Date: Thu, 9 Feb 2012 09:21:20 +0000 (-0500)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.12-alpha~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef0bc7f8f26a917c89ca947a2b432b57cd5e06b5;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

ef0bc7f8f26a917c89ca947a2b432b57cd5e06b5