From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 30 Apr 2015 17:32:52 +0000 (-0400)
Subject: Merge branch 'bug15814_027_04'
X-Git-Tag: tor-0.2.7.1-alpha~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41efe22c030e7c896ae5e1c380a3d783c03f0861;p=thirdparty%2Ftor.git

Merge branch 'bug15814_027_04'
---

41efe22c030e7c896ae5e1c380a3d783c03f0861