From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Oct 2019 13:08:23 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/1382'
X-Git-Tag: tor-0.4.2.2-alpha~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de7fcae72a2de3ba8bb8025051ee43ebe07876bb;p=thirdparty%2Ftor.git

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

de7fcae72a2de3ba8bb8025051ee43ebe07876bb