From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 25 Oct 2011 21:53:55 +0000 (-0400)
Subject: Merge branch 'ticket4294'
X-Git-Tag: tor-0.2.3.6-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa3c70922002b1fbb8fa5e60fbfe0c25d2d1abae;p=thirdparty%2Ftor.git

Merge branch 'ticket4294'
---

aa3c70922002b1fbb8fa5e60fbfe0c25d2d1abae