From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 2 May 2019 12:36:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/989'
X-Git-Tag: tor-0.4.1.1-alpha~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a2b96cae63cc4eb5d24751ccc0b44501128090e;p=thirdparty%2Ftor.git

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

0a2b96cae63cc4eb5d24751ccc0b44501128090e