From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 5 Feb 2015 15:59:44 +0000 (-0500)
Subject: Merge remote-tracking branch 'yawning/bug14740'
X-Git-Tag: tor-0.2.6.3-alpha~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=377584abbd56ab6d585ccde893398068ada8fdaa;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'yawning/bug14740'
---

377584abbd56ab6d585ccde893398068ada8fdaa