From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 23 Nov 2011 21:28:18 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.9-alpha~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3890c81e7c4eaa3350fe569dbc2fbf97e824e4c0;p=thirdparty%2Ftor.git

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

3890c81e7c4eaa3350fe569dbc2fbf97e824e4c0