From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Jan 2018 15:18:35 +0000 (-0500)
Subject: Merge branch 'maint-0.3.1'
X-Git-Tag: tor-0.3.3.1-alpha~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9652c65fa3b9b3346d346daea05c8b3c22b3e125;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1'

"ours" merge to avoid the 0.3.1 version of the 24863 fix.
---

9652c65fa3b9b3346d346daea05c8b3c22b3e125