From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 27 May 2014 21:35:04 +0000 (-0400)
Subject: Merge branch 'bug11622'
X-Git-Tag: tor-0.2.5.5-alpha~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba9946dda702162f2fc7c35d79825604433eb0a9;p=thirdparty%2Ftor.git

Merge branch 'bug11622'
---

ba9946dda702162f2fc7c35d79825604433eb0a9