From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Jul 2011 16:56:40 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=734e860d98e1874dcd92e69051806e53205ee0b0;p=thirdparty%2Ftor.git

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

734e860d98e1874dcd92e69051806e53205ee0b0