From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 Jun 2011 15:08:28 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a610ebc3a6990261f1cd4ac7c498a3fe8a6c1a53;p=thirdparty%2Ftor.git

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

a610ebc3a6990261f1cd4ac7c498a3fe8a6c1a53