From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 22 Oct 2018 12:49:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/421'
X-Git-Tag: tor-0.4.0.1-alpha~222
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=afc22ec5396e677c8cc3f7f14ecec7dc02a75b63;p=thirdparty%2Ftor.git

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

afc22ec5396e677c8cc3f7f14ecec7dc02a75b63