From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 23 Oct 2017 13:22:43 +0000 (-0400)
Subject: Merge branch 'maint-0.3.1' into maint-0.3.2
X-Git-Tag: tor-0.3.2.3-alpha~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b8d501040946bb2280a9640f91a55b7f17b03e3;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid taking af33fdd7c1860399fe8d6861c163e5d64b0292b9
---

8b8d501040946bb2280a9640f91a55b7f17b03e3