From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 19 Aug 2019 15:26:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/1224'
X-Git-Tag: tor-0.4.2.1-alpha~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29bd43ab03fd09e9d23b33ae4f126382008739ea;p=thirdparty%2Ftor.git

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

29bd43ab03fd09e9d23b33ae4f126382008739ea