From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 30 Oct 2018 13:16:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/425'
X-Git-Tag: tor-0.4.0.1-alpha~205
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30d853a9067e866312e475f42fb6063718591af8;p=thirdparty%2Ftor.git

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

30d853a9067e866312e475f42fb6063718591af8