From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 21 Nov 2011 15:52:38 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.8-alpha~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=929074b368fe94cbe74a49e5353a35f60c6623af;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2'
---

929074b368fe94cbe74a49e5353a35f60c6623af