From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 23 Mar 2018 15:22:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'fristonio/ticket-24740'
X-Git-Tag: tor-0.3.4.1-alpha~216
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e263317e07e61e7adbb3515b46a978997a9d20c0;p=thirdparty%2Ftor.git

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

e263317e07e61e7adbb3515b46a978997a9d20c0