From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Mar 2014 16:52:22 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.3-alpha~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a50690e68f8a332321e88f0ac8c3046186bc1c1f;p=thirdparty%2Ftor.git

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

a50690e68f8a332321e88f0ac8c3046186bc1c1f