From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 May 2011 15:36:41 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fa7bcead5d8344b80ee295f3c1e0e15fd37ba87;p=thirdparty%2Ftor.git

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

8fa7bcead5d8344b80ee295f3c1e0e15fd37ba87