From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 2 Sep 2019 18:13:32 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/1272'
X-Git-Tag: tor-0.4.2.1-alpha~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78307ed1866ffdec58aaac14f24ba3d77c571f59;p=thirdparty%2Ftor.git

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

78307ed1866ffdec58aaac14f24ba3d77c571f59