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

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

7b2357a37ab0c0293aad3eb185414f086bbe44d9