From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 Mar 2018 21:43:10 +0000 (-0500)
Subject: Merge branch 'maint-0.3.1' into maint-0.3.2
X-Git-Tag: tor-0.3.2.10~2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b0ae084008eac13d051026c013862b239212807;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" to avoid version bump.
---

5b0ae084008eac13d051026c013862b239212807