From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 23 Jul 2019 18:03:30 +0000 (-0400)
Subject: Merge branch 'ticket24963_042_02'
X-Git-Tag: tor-0.4.2.1-alpha~128
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab1f82ea2a3ef9f9bc920885e40e7b477b3dfb93;p=thirdparty%2Ftor.git

Merge branch 'ticket24963_042_02'
---

ab1f82ea2a3ef9f9bc920885e40e7b477b3dfb93