From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 28 Jun 2017 17:54:00 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0' into maint-0.3.1
X-Git-Tag: tor-0.3.1.4-alpha~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c57a119eb886d705bc2a067635ca7ef8bc74f1de;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid taking redundant ws fix
---

c57a119eb886d705bc2a067635ca7ef8bc74f1de