From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 11 May 2018 22:15:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'catalyst-github/bug25756'
X-Git-Tag: tor-0.3.4.1-alpha~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aab626405c312a33d521c9ca3729552fd9ccca2e;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'catalyst-github/bug25756'
---

aab626405c312a33d521c9ca3729552fd9ccca2e