From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 20 May 2013 16:34:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
X-Git-Tag: tor-0.2.4.13-alpha~7^2~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78735f87785a460e587e2fc879604a7603d4b0e5;p=thirdparty%2Ftor.git

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

78735f87785a460e587e2fc879604a7603d4b0e5