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

Merge branch 'bug28348_036'
---

17d8ccefc0f27b0c57e501acb4f4a1a379139953