From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 31 May 2012 18:37:29 +0000 (-0400)
Subject: Merge remote-tracking branch 'linus/bug4873_ln'
X-Git-Tag: tor-0.2.3.16-alpha~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1bbd84a6d1f5e721badb55755e278f2e4f0bf7b;p=thirdparty%2Ftor.git

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

d1bbd84a6d1f5e721badb55755e278f2e4f0bf7b