From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Nov 2011 17:24:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.8-alpha~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1005dd6d34a40080af478ef4cb85860d04f3844;p=thirdparty%2Ftor.git

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

c1005dd6d34a40080af478ef4cb85860d04f3844