From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 12 Feb 2019 14:55:09 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.1.0-alpha-dev~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed05b7dddcb5985ca2be96ab57fed70394a7cebe;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'
---

ed05b7dddcb5985ca2be96ab57fed70394a7cebe