From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 11 Dec 2017 14:46:23 +0000 (-0500)
Subject: Merge remote-tracking branch 'teor/comment24575'
X-Git-Tag: tor-0.3.3.1-alpha~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=030d3d52f5bf03d2e611c7f208a56b3e45d47210;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'teor/comment24575'
---

030d3d52f5bf03d2e611c7f208a56b3e45d47210