From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 19 Mar 2018 10:42:10 +0000 (-0400)
Subject: Merge remote-tracking branch 'fristonio/ticket-6236'
X-Git-Tag: tor-0.3.4.1-alpha~232
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0f0c0f5505b3cf4cfbd4a3c1908ace4740f343b;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'fristonio/ticket-6236'
---

b0f0c0f5505b3cf4cfbd4a3c1908ace4740f343b