From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Feb 2020 15:23:50 +0000 (-0500)
Subject: Merge remote-tracking branch 'tor-github/pr/1711'
X-Git-Tag: tor-0.4.3.2-alpha~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05a05773f284dd870282e05ae918d74300ddbc19;p=thirdparty%2Ftor.git

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

05a05773f284dd870282e05ae918d74300ddbc19