From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 16 Oct 2018 21:29:50 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/404'
X-Git-Tag: tor-0.3.5.3-alpha~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=698629f5a9eca21e0251f5d249f176a00aebf871;p=thirdparty%2Ftor.git

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

698629f5a9eca21e0251f5d249f176a00aebf871