From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Dec 2018 14:02:49 +0000 (-0500)
Subject: Merge remote-tracking branch 'tor-github/pr/531'
X-Git-Tag: tor-0.4.0.1-alpha~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4f558e385fd9e3f757278653d22290c3816c39e;p=thirdparty%2Ftor.git

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

d4f558e385fd9e3f757278653d22290c3816c39e