From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Nov 2018 17:01:53 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.4-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ea508ec6f540f0c768d993df257a9733fac4074;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" merge to avoid version bump.
---

0ea508ec6f540f0c768d993df257a9733fac4074