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

Merge branch 'maint-0.2.2'
---

92862c6d48026811c32d3e603524185778d0b4d7