From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 4 Dec 2017 16:43:11 +0000 (-0500)
Subject: Merge branch 'bug23826-23828_squashed'
X-Git-Tag: tor-0.3.3.1-alpha~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f50d64b62eeb7c07f2e0dd7f23499880d208a434;p=thirdparty%2Ftor.git

Merge branch 'bug23826-23828_squashed'
---

f50d64b62eeb7c07f2e0dd7f23499880d208a434