From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 10 Oct 2018 13:24:48 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/384'
X-Git-Tag: tor-0.3.5.3-alpha~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da86a70bd8ea6c468ac7e27a53245bbeb9d28b58;p=thirdparty%2Ftor.git

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

da86a70bd8ea6c468ac7e27a53245bbeb9d28b58