From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Feb 2019 16:30:27 +0000 (-0500)
Subject: Merge remote-tracking branch 'tor-github/pr/678'
X-Git-Tag: tor-0.4.1.1-alpha~224
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0db0b4769c118ad8d77c8745877017144bc5805a;p=thirdparty%2Ftor.git

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

0db0b4769c118ad8d77c8745877017144bc5805a