From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 20 Nov 2018 18:14:56 +0000 (-0500)
Subject: Merge branch 'ticket25341_merged_v2'
X-Git-Tag: tor-0.4.0.1-alpha~123
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b406fdae4fff9a6495a9ad319e7f2b565de52ac8;p=thirdparty%2Ftor.git

Merge branch 'ticket25341_merged_v2'
---

b406fdae4fff9a6495a9ad319e7f2b565de52ac8