From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 29 Oct 2018 19:59:06 +0000 (-0400)
Subject: Merge branch '27913_rebased_035' into maint-0.3.5
X-Git-Tag: tor-0.3.5.4-alpha~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=709cd447f0b207f969d448bd4fe2d5f2795e678d;p=thirdparty%2Ftor.git

Merge branch '27913_rebased_035' into maint-0.3.5
---

709cd447f0b207f969d448bd4fe2d5f2795e678d