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

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

6320b2988c59afb69c80ee0855579960e40a77d8