From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 1 Dec 2018 16:24:02 +0000 (-0500)
Subject: Merge remote-tracking branch 'tor-github/pr/536'
X-Git-Tag: tor-0.4.0.1-alpha~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e9985b75aa69d4572aac739d44d50056ed20e82;p=thirdparty%2Ftor.git

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

7e9985b75aa69d4572aac739d44d50056ed20e82