From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 28 Sep 2012 15:57:36 +0000 (-0400)
Subject: Merge remote-tracking branch 'linus/enh6876_2'
X-Git-Tag: tor-0.2.4.4-alpha~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f494a363a725951af884882a472ff4ab2b0a6db;p=thirdparty%2Ftor.git

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

5f494a363a725951af884882a472ff4ab2b0a6db