From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 21 Mar 2016 14:20:16 +0000 (-0400)
Subject: Merge branch 'bug18570_027'
X-Git-Tag: tor-0.2.8.2-alpha~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb3f9bc2d48e8c3f4847643c03e082d394d33168;p=thirdparty%2Ftor.git

Merge branch 'bug18570_027'
---

cb3f9bc2d48e8c3f4847643c03e082d394d33168