From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 26 Apr 2019 00:08:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/922'
X-Git-Tag: tor-0.4.1.1-alpha~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36b4fc7437f22208838616495f699b793ca30771;p=thirdparty%2Ftor.git

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

36b4fc7437f22208838616495f699b793ca30771