From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 29 Apr 2019 17:36:35 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/972'
X-Git-Tag: tor-0.4.1.1-alpha~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44e6663b8a51187e80a3f94d1185950cf62b4264;p=thirdparty%2Ftor.git

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

44e6663b8a51187e80a3f94d1185950cf62b4264