From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 Feb 2019 20:19:59 +0000 (-0500)
Subject: Merge remote-tracking branch 'tor-github/pr/699'
X-Git-Tag: tor-0.4.1.0-alpha-dev~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f42bc0f485f768081307f8afc1642140acb4810;p=thirdparty%2Ftor.git

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

5f42bc0f485f768081307f8afc1642140acb4810