From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Dec 2013 00:01:29 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3121a6d0c8c8c3f7c01f09120dbe9c4f5a8adfdb;p=thirdparty%2Ftor.git

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

3121a6d0c8c8c3f7c01f09120dbe9c4f5a8adfdb