From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 18 Oct 2018 13:12:58 +0000 (-0400)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~229
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e979a56bb6d9c571ad6c033b739f9f7edc8b0000;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

e979a56bb6d9c571ad6c033b739f9f7edc8b0000