From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Dec 2011 16:32:49 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.10-alpha~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e402edd96064ae853767dff459da2646bc70af5e;p=thirdparty%2Ftor.git

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

e402edd96064ae853767dff459da2646bc70af5e