From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 20 Feb 2018 15:03:52 +0000 (-0500)
Subject: Merge remote-tracking branch 'fristonio/ticket-25261'
X-Git-Tag: tor-0.3.4.1-alpha~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4ab273a0dafdd85e8e9f204c6e3e092282d3620;p=thirdparty%2Ftor.git

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

a4ab273a0dafdd85e8e9f204c6e3e092282d3620