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

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

c6d3bebb1e32fa62712a475081a6724ffa5c9d67