From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 24 Oct 2018 16:59:51 +0000 (-0400)
Subject: Merge branch 'ticket28177'
X-Git-Tag: tor-0.4.0.1-alpha~214
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76da5f8b807bfad1763e6ce3ac6dfba3725c9c13;p=thirdparty%2Ftor.git

Merge branch 'ticket28177'
---

76da5f8b807bfad1763e6ce3ac6dfba3725c9c13