From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Oct 2011 20:32:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'rransom-tor/bug4018'
X-Git-Tag: tor-0.2.3.6-alpha~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b49fcc6cf2b893fca04eaec8d30bbfe25c04d360;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'rransom-tor/bug4018'
---

b49fcc6cf2b893fca04eaec8d30bbfe25c04d360