From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Oct 2019 20:29:46 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/1401'
X-Git-Tag: tor-0.4.3.0-alpha-dev~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=755f0016009424935f3b9216cad79d54129614cc;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'tor-github/pr/1401'
---

755f0016009424935f3b9216cad79d54129614cc