From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 24 Apr 2019 21:05:20 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/964'
X-Git-Tag: tor-0.4.1.1-alpha~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0cbe0f9cabd1af990ae1b0f3b430b9b9a68f3e6d;p=thirdparty%2Ftor.git

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

0cbe0f9cabd1af990ae1b0f3b430b9b9a68f3e6d