From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Apr 2019 18:30:05 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/913'
X-Git-Tag: tor-0.4.1.1-alpha~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fabf104ed8163e6647a31d3f54aaf4eba5dacb0;p=thirdparty%2Ftor.git

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

9fabf104ed8163e6647a31d3f54aaf4eba5dacb0