From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 21 Aug 2012 14:21:53 +0000 (-0400)
Subject: Merge remote-tracking branch 'linus/bug6621'
X-Git-Tag: tor-0.2.4.1-alpha~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d517233e71139e60a1050ca86586f4cf3857b792;p=thirdparty%2Ftor.git

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

d517233e71139e60a1050ca86586f4cf3857b792