From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Oct 2011 19:56:51 +0000 (-0400)
Subject: Merge branch 'bug3512'
X-Git-Tag: tor-0.2.3.6-alpha~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b8bfb3df38ef3ebdccac3092585e310bef07059;p=thirdparty%2Ftor.git

Merge branch 'bug3512'
---

5b8bfb3df38ef3ebdccac3092585e310bef07059