From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 17 Jun 2019 12:56:13 +0000 (-0400)
Subject: Merge branch 'ticket29533_squashed'
X-Git-Tag: tor-0.4.2.1-alpha~164
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93ca08d66c329eef9691afe6292b2e15246f5510;p=thirdparty%2Ftor.git

Merge branch 'ticket29533_squashed'
---

93ca08d66c329eef9691afe6292b2e15246f5510