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

Merge branch 'ticket28755_v2_squashed'
---

4afc6b172a8984aad0954dd38d44dede6d007c51