From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 May 2015 14:48:52 +0000 (-0400)
Subject: Merge remote-tracking branch 'yawning/bug16052a_027'
X-Git-Tag: tor-0.2.7.2-alpha~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb7f4d0059d447f79362be22c9c0c3c66ec85857;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'yawning/bug16052a_027'
---

eb7f4d0059d447f79362be22c9c0c3c66ec85857