From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 3 Apr 2018 23:19:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'fristonio/ticket-25645'
X-Git-Tag: tor-0.3.4.1-alpha~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=218b1746baea65c06551f7e2736d382e6a01a49d;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'fristonio/ticket-25645'
---

218b1746baea65c06551f7e2736d382e6a01a49d