From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Nov 2011 16:04:40 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.8-alpha~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0589da0e3270e627ac6fd249976234a4c085d3f;p=thirdparty%2Ftor.git

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

f0589da0e3270e627ac6fd249976234a4c085d3f