From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 9 Apr 2020 15:50:20 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/1801/head'
X-Git-Tag: tor-0.4.5.0-alpha-dev~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80031db32abebaf4d0a91c01db258fcdbd54a471;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'tor-github/pr/1801/head'
---

80031db32abebaf4d0a91c01db258fcdbd54a471