From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 8 May 2013 17:01:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f21838ee5305b89c4089a06ca51e95bc89ae053;p=thirdparty%2Ftor.git

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

8f21838ee5305b89c4089a06ca51e95bc89ae053