From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 6 Jan 2020 18:28:10 +0000 (-0500)
Subject: Merge remote-tracking branch 'tor-github/pr/1620'
X-Git-Tag: tor-0.4.3.1-alpha~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f498220bda87e44d8a3ab12825270fde6eec7dc;p=thirdparty%2Ftor.git

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

1f498220bda87e44d8a3ab12825270fde6eec7dc