From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 20 Dec 2013 16:40:21 +0000 (-0500)
Subject: Merge remote-tracking branch 'linus/bug10324'
X-Git-Tag: tor-0.2.5.2-alpha~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b98c5884fc28c4c2b4871d00bd6eeb78fadab3f3;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'linus/bug10324'
---

b98c5884fc28c4c2b4871d00bd6eeb78fadab3f3