From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 May 2014 03:12:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.5-alpha~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=defe541a3084532eb34bab82341752323cf7efca;p=thirdparty%2Ftor.git

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

defe541a3084532eb34bab82341752323cf7efca