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

Merge branch 'maint-0.2.2'
---

929ebde2b908616fac381be78a5828c9d0fdd273