From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Feb 2019 16:56:48 +0000 (-0500)
Subject: Merge remote-tracking branch 'tor-github/pr/665'
X-Git-Tag: tor-0.4.1.1-alpha~217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6927e9a60ca12fa67d6a33044c2903ce95ca1605;p=thirdparty%2Ftor.git

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

6927e9a60ca12fa67d6a33044c2903ce95ca1605