From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Sep 2018 13:47:32 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/294'
X-Git-Tag: tor-0.3.5.1-alpha~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8815960c4615da0015e78c3256c3f611a30f6e6c;p=thirdparty%2Ftor.git

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

8815960c4615da0015e78c3256c3f611a30f6e6c