From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Sep 2012 14:19:57 +0000 (-0400)
Subject: Merge remote-tracking branch 'linus/bug6797'
X-Git-Tag: tor-0.2.4.2-alpha~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ab7716b9ec0deebfa3124ffc2c7a7f0b0d705e6;p=thirdparty%2Ftor.git

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

0ab7716b9ec0deebfa3124ffc2c7a7f0b0d705e6