From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Jun 2019 19:35:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/1076'
X-Git-Tag: tor-0.4.1.2-alpha~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54eb3c043c1c7599a7cbd73321fba3476d49728b;p=thirdparty%2Ftor.git

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

54eb3c043c1c7599a7cbd73321fba3476d49728b