From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Jan 2019 02:17:46 +0000 (-0500)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.8~26^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=971f4bf13944864156684b3d3be8df53fb9d0686;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid version bump
---

971f4bf13944864156684b3d3be8df53fb9d0686