From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 23 Apr 2019 16:48:37 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/962'
X-Git-Tag: tor-0.4.1.1-alpha~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7599c5be2cd9b02a2b0e9760a6762a623fd0d7b;p=thirdparty%2Ftor.git

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

a7599c5be2cd9b02a2b0e9760a6762a623fd0d7b