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

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

9276c07a916e4dc3b159c95c578e43be102f26e6