From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 24 Oct 2011 14:21:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'sebastian/bug4293'
X-Git-Tag: tor-0.2.3.6-alpha~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea0518f209959250dd07272d739a6d9aa9531444;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'sebastian/bug4293'
---

ea0518f209959250dd07272d739a6d9aa9531444