From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 22 Dec 2011 15:51:39 +0000 (-0500)
Subject: Merge remote-tracking branch 'rransom/feature2411-v4'
X-Git-Tag: tor-0.2.3.11-alpha~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7cb804343b827ce048c2468d16f6887238790241;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'rransom/feature2411-v4'
---

7cb804343b827ce048c2468d16f6887238790241