From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Dec 2011 20:38:29 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.9-alpha~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0920cd02f4c49b64d30879b18c4287384a36d9f1;p=thirdparty%2Ftor.git

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

0920cd02f4c49b64d30879b18c4287384a36d9f1