From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Jul 2017 14:57:05 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0' into maint-0.3.1
X-Git-Tag: tor-0.3.1.5-alpha~31^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1bdc3b10e66de6d79c48c94628956b8578d5f17;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0' into maint-0.3.1

This is an "ours" commit to avoid taking the fix for 22838,
which we already have here.
---

c1bdc3b10e66de6d79c48c94628956b8578d5f17