From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Dec 2018 12:59:44 +0000 (-0500)
Subject: Merge branch 'ticket28479_squashed'
X-Git-Tag: tor-0.4.0.1-alpha~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df70bc3a888ac0e746649018202ca84a8615df82;p=thirdparty%2Ftor.git

Merge branch 'ticket28479_squashed'
---

df70bc3a888ac0e746649018202ca84a8615df82