From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Jan 2019 13:08:41 +0000 (-0500)
Subject: Merge branch 'ticket28058_squashed'
X-Git-Tag: tor-0.4.0.1-alpha~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c281e587bb1b4ac1bdaa97ea68c1ab0c80fe4bab;p=thirdparty%2Ftor.git

Merge branch 'ticket28058_squashed'
---

c281e587bb1b4ac1bdaa97ea68c1ab0c80fe4bab