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

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

8cd5a3c1865c2115d88b08041a27e2cfdd7d24d2