From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Dec 2018 15:04:16 +0000 (-0500)
Subject: Merge remote-tracking branch 'teor/ticket24838'
X-Git-Tag: tor-0.4.0.1-alpha~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91be6a77e9f16a9817b20c5b0f5ba3df3b54b31f;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'teor/ticket24838'
---

91be6a77e9f16a9817b20c5b0f5ba3df3b54b31f