From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 15 Feb 2017 13:08:25 +0000 (-0500)
Subject: Merge branch 'bug21447'
X-Git-Tag: tor-0.3.0.4-rc~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39af9fc2b7ed60ed4007cf47a643e30b4c615aae;p=thirdparty%2Ftor.git

Merge branch 'bug21447'
---

39af9fc2b7ed60ed4007cf47a643e30b4c615aae